Merge remote-tracking branch 'pytroll/main' into main

pytroll · Mar 24, 2023 · 09ad15d · 09ad15d
2 parents d319a9b + b92fe9e
commit 09ad15d
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 5 deletions.
diff --git 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,6 +148,59 @@ 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, mod06_hdf]
+    coordinates: [longitude, latitude]
+    resolution:
+      5000:
+        file_key: Scan_Start_Time
+
+  satellite_zenith_angle:
+    name: satellite_zenith_angle
+    long_name: Sensor Zenith Angle, Cell to Sensor
+    units: degree
+    file_type: [mod05_hdf, mod06_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: "1"
+    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
 ##########################

diff --git 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")
     )