From 9be06d284d4445790393b20e8c405efbaee59a12 Mon Sep 17 00:00:00 2001 From: Panu Lahtinen Date: Thu, 30 Jan 2025 10:02:40 +0200 Subject: [PATCH 1/4] Add reader configurations for more VIIRS EDR datasets --- satpy/etc/readers/viirs_edr.yaml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/satpy/etc/readers/viirs_edr.yaml b/satpy/etc/readers/viirs_edr.yaml index 4c4c91a91f..67b54bea51 100644 --- a/satpy/etc/readers/viirs_edr.yaml +++ b/satpy/etc/readers/viirs_edr.yaml @@ -36,6 +36,38 @@ file_types: file_reader: !!python/name:satpy.readers.viirs_edr.VIIRSLSTHandler file_patterns: - 'LST_{version}_{platform_shortname}_s{start_time:%Y%m%d%H%M%S%f}_e{end_time:%Y%m%d%H%M%S%f}_c{creation_time}.nc' + jrr_cloudbase: + file_reader: !!python/name:satpy.readers.viirs_edr.VIIRSJRRFileHandler + file_patterns: + - 'JRR-CloudBase_{version}_{platform_shortname}_s{start_time:%Y%m%d%H%M%S%f}_e{end_time:%Y%m%d%H%M%S%f}_c{creation_time}.nc' + jrr_aerosol_detection: + file_reader: !!python/name:satpy.readers.viirs_edr.VIIRSJRRFileHandler + file_patterns: + - 'JRR-ADP_{version}_{platform_shortname}_s{start_time:%Y%m%d%H%M%S%f}_e{end_time:%Y%m%d%H%M%S%f}_c{creation_time}.nc' + jrr_clouddcomp: + file_reader: !!python/name:satpy.readers.viirs_edr.VIIRSJRRFileHandler + file_patterns: + - 'JRR-CloudDCOMP_{version}_{platform_shortname}_s{start_time:%Y%m%d%H%M%S%f}_e{end_time:%Y%m%d%H%M%S%f}_c{creation_time}.nc' + jrr_cloudncomp: + file_reader: !!python/name:satpy.readers.viirs_edr.VIIRSJRRFileHandler + file_patterns: + - 'JRR-CloudNCOMP_{version}_{platform_shortname}_s{start_time:%Y%m%d%H%M%S%f}_e{end_time:%Y%m%d%H%M%S%f}_c{creation_time}.nc' + jrr_cloudlayers: + file_reader: !!python/name:satpy.readers.viirs_edr.VIIRSJRRFileHandler + file_patterns: + - 'JRR-CloudCoverLayers_{version}_{platform_shortname}_s{start_time:%Y%m%d%H%M%S%f}_e{end_time:%Y%m%d%H%M%S%f}_c{creation_time}.nc' + jrr_cloudphase: + file_reader: !!python/name:satpy.readers.viirs_edr.VIIRSJRRFileHandler + file_patterns: + - 'JRR-CloudPhase_{version}_{platform_shortname}_s{start_time:%Y%m%d%H%M%S%f}_e{end_time:%Y%m%d%H%M%S%f}_c{creation_time}.nc' + jrr_iceconcentration: + file_reader: !!python/name:satpy.readers.viirs_edr.VIIRSJRRFileHandler + file_patterns: + - 'JRR-IceConcentration_{version}_{platform_shortname}_s{start_time:%Y%m%d%H%M%S%f}_e{end_time:%Y%m%d%H%M%S%f}_c{creation_time}.nc' + jrr_iceage: + file_reader: !!python/name:satpy.readers.viirs_edr.VIIRSJRRFileHandler + file_patterns: + - 'JRR-IceAge_{version}_{platform_shortname}_s{start_time:%Y%m%d%H%M%S%f}_e{end_time:%Y%m%d%H%M%S%f}_c{creation_time}.nc' datasets: From edd3ac9105e23368748b2b1e89dc9df6fae7a0aa Mon Sep 17 00:00:00 2001 From: Panu Lahtinen Date: Thu, 30 Jan 2025 10:13:21 +0200 Subject: [PATCH 2/4] Remove duplicate ADB entry --- satpy/etc/readers/viirs_edr.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/satpy/etc/readers/viirs_edr.yaml b/satpy/etc/readers/viirs_edr.yaml index 67b54bea51..e53a27d072 100644 --- a/satpy/etc/readers/viirs_edr.yaml +++ b/satpy/etc/readers/viirs_edr.yaml @@ -40,10 +40,6 @@ file_types: file_reader: !!python/name:satpy.readers.viirs_edr.VIIRSJRRFileHandler file_patterns: - 'JRR-CloudBase_{version}_{platform_shortname}_s{start_time:%Y%m%d%H%M%S%f}_e{end_time:%Y%m%d%H%M%S%f}_c{creation_time}.nc' - jrr_aerosol_detection: - file_reader: !!python/name:satpy.readers.viirs_edr.VIIRSJRRFileHandler - file_patterns: - - 'JRR-ADP_{version}_{platform_shortname}_s{start_time:%Y%m%d%H%M%S%f}_e{end_time:%Y%m%d%H%M%S%f}_c{creation_time}.nc' jrr_clouddcomp: file_reader: !!python/name:satpy.readers.viirs_edr.VIIRSJRRFileHandler file_patterns: From c2cbf3ff1798c039d83a9d3ab2fe0e74e36ca1d6 Mon Sep 17 00:00:00 2001 From: David Hoese Date: Thu, 30 Jan 2025 09:35:10 -0600 Subject: [PATCH 3/4] Change docstring section title in satpy_cf_nc.py --- satpy/readers/satpy_cf_nc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/satpy/readers/satpy_cf_nc.py b/satpy/readers/satpy_cf_nc.py index 9f742272a1..b34e13d028 100644 --- a/satpy/readers/satpy_cf_nc.py +++ b/satpy/readers/satpy_cf_nc.py @@ -91,8 +91,8 @@ ''AVHRR-GAC_FDR_1C_{platform}_{start_time:%Y%m%dT%H%M%SZ}_{end_time:%Y%m%dT%H%M%SZ}_{processing_mode}_{disposition_mode}_{creation_time}_{version_int:04d}.nc' -Example: --------- +**Example**: + Here is an example how to read the data in satpy: .. code-block:: python From 0a734babc73e41c99cf7496ad8935a83d94b3d04 Mon Sep 17 00:00:00 2001 From: David Hoese Date: Thu, 30 Jan 2025 09:36:04 -0600 Subject: [PATCH 4/4] Add dask-expr to rtd_environment.yml --- doc/rtd_environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/rtd_environment.yml b/doc/rtd_environment.yml index 3b11a9a20b..58a1e068f5 100644 --- a/doc/rtd_environment.yml +++ b/doc/rtd_environment.yml @@ -7,6 +7,7 @@ dependencies: - platformdirs - dask - dask-image + - dask-expr - defusedxml - donfig # 2.19.1 seems to cause library linking issues