Merge pull request #2531 from djhoese/viirs_edr_jrr

pytroll · Aug 18, 2023 · 2958fe9 · 2958fe9
2 parents 7ac4383 + 3b078da
commit 2958fe9
Show file tree

Hide file tree

Showing 12 changed files with 1,194 additions and 389 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -82,6 +82,9 @@ jobs:
       - name: Update environment
         run: mamba env update -n test-environment -f continuous_integration/environment.yaml
         if: steps.cache.outputs.cache-hit != 'true'
+      - name: Update environment - libnetcdf
+        run: mamba install -y -n test-environment libnetcdf=4.9.2=nompi_h5902ca5_107
+        if: runner.os == 'Windows'
 
       - name: Install unstable dependencies
         if: matrix.experimental == true

diff --git a/satpy/etc/composites/viirs.yaml b/satpy/etc/composites/viirs.yaml
@@ -231,10 +231,10 @@ composites:
     - name: M05
       modifiers: [sunz_corrected, rayleigh_corrected]
     optional_prerequisites:
-    - name: I01
+    - name: I02
       modifiers: [sunz_corrected_iband, rayleigh_corrected_iband]
     standard_name: false_color
-    high_resolution_band: blue
+    high_resolution_band: green
 
   fire_temperature:
     # CIRA: Original VIIRS
@@ -306,6 +306,53 @@ composites:
       modifiers: [sunz_corrected_iband]
     standard_name: natural_color
 
+  natural_color_surf:
+    compositor: !!python/name:satpy.composites.RGBCompositor
+    prerequisites:
+    - name: surf_refl_I03
+    - name: surf_refl_I02
+    - name: surf_refl_I01
+    standard_name: natural_color
+
+  natural_color_lowres_surf:
+    compositor: !!python/name:satpy.composites.RGBCompositor
+    prerequisites:
+    - name: surf_refl_M10
+    - name: surf_refl_M07
+    - name: surf_refl_M05
+    standard_name: natural_color
+
+  false_color_surf:
+    compositor: !!python/name:satpy.composites.RatioSharpenedRGB
+    prerequisites:
+      - name: surf_refl_M11
+      - name: surf_refl_M07
+      - name: surf_refl_M05
+    optional_prerequisites:
+      - name: surf_refl_I02
+    standard_name: false_color
+    high_resolution_band: green
+
+
+  true_color_lowres_surf:
+    compositor: !!python/name:satpy.composites.RGBCompositor
+    prerequisites:
+    - name: surf_refl_M05
+    - name: surf_refl_M04
+    - name: surf_refl_M03
+    standard_name: true_color
+
+  true_color_surf:
+    compositor: !!python/name:satpy.composites.RatioSharpenedRGB
+    prerequisites:
+      - name: surf_refl_M05
+      - name: surf_refl_M04
+      - name: surf_refl_M03
+    optional_prerequisites:
+      - name: surf_refl_I01
+    standard_name: true_color
+    high_resolution_band: red
+
   natural_color_sun_lowres:
     compositor: !!python/name:satpy.composites.RGBCompositor
     prerequisites:
@@ -328,14 +375,6 @@ composites:
       modifiers: [sunz_corrected]
     standard_name: true_color
 
-  night_overview:
-    compositor: !!python/name:satpy.composites.GenericCompositor
-    prerequisites:
-    - DNB
-    - DNB
-    - M15
-    standard_name: night_overview
-
   overview:
     compositor: !!python/name:satpy.composites.GenericCompositor
     prerequisites:

diff --git a/satpy/etc/enhancements/generic.yaml b/satpy/etc/enhancements/generic.yaml
@@ -15,6 +15,15 @@ enhancements:
     - name: gamma
       method: !!python/name:satpy.enhancements.gamma
       kwargs: {gamma: 1.5}
+  surface_reflectance_default:
+    standard_name: surface_bidirectional_reflectance
+    operations:
+      - name: linear_stretch
+        method: !!python/name:satpy.enhancements.stretch
+        kwargs: {stretch: 'crude', min_stretch: 0.0, max_stretch: 100.}
+      - name: gamma
+        method: !!python/name:satpy.enhancements.gamma
+        kwargs: {gamma: 1.5}
   true_color_default:
     standard_name: true_color
     operations:

diff --git a/satpy/etc/enhancements/viirs.yaml b/satpy/etc/enhancements/viirs.yaml
@@ -14,67 +14,68 @@ enhancements:
     - name: WaterDetection
       method: !!python/name:satpy.enhancements.viirs.water_detection
       kwargs:
-        palettes: {colors:
-                     [[14, [0.0, 0.0, 0.0]],
-                      [15, [0.0, 0.0, 0.39215686274509803]],
-                      [16, [0.7686274509803922, 0.6352941176470588, 0.4470588235294118]],
-                      [17, [0.7686274509803922, 0.6352941176470588, 0.4470588235294118]],
-                      [18, [0.0, 0.0, 1.0]],
-                      [20, [1.0, 1.0, 1.0]],
-                      [27, [0.0, 1.0, 1.0]],
-                      [30, [0.7843137254901961, 0.7843137254901961, 0.7843137254901961]],
-                      [31, [0.39215686274509803, 0.39215686274509803, 0.39215686274509803]],
-                      [88, [0.7058823529411765, 0.0, 0.9019607843137255]],
-                      [100, [0.19607843137254902, 1.0, 0.39215686274509803]],
-                      [120, [0.19607843137254902, 1.0, 0.39215686274509803]],
-                      [121, [0.0, 1.0, 0.0]],
-                      [130, [0.0, 1.0, 0.0]],
-                      [131, [0.7843137254901961, 1.0, 0.0]],
-                      [140, [0.7843137254901961, 1.0, 0.0]],
-                      [141, [1.0, 1.0, 0.5882352941176471]],
-                      [150, [1.0, 1.0, 0.5882352941176471]],
-                      [151, [1.0, 1.0, 0.0]],
-                      [160, [1.0, 1.0, 0.0]],
-                      [161, [1.0, 0.7843137254901961, 0.0]],
-                      [170, [1.0, 0.7843137254901961, 0.0]],
-                      [171, [1.0, 0.5882352941176471, 0.19607843137254902]],
-                      [180, [1.0, 0.5882352941176471, 0.19607843137254902]],
-                      [181, [1.0, 0.39215686274509803, 0.0]],
-                      [190, [1.0, 0.39215686274509803, 0.0]],
-                      [191, [1.0, 0.0, 0.0]],
-                      [200, [1.0, 0.0, 0.0]],
-                      [201, [0.0, 0.0, 0.0]]],
-                   min_value: 0,
-                   max_value: 201}
-#        palettes: {colors:
-#                [[14, [0.0, 0.0, 0.0, 0.0]],
-#                [15, [0.0, 0.0, 0.39215686274509803, 1.0]],
-#                [16, [0.7686274509803922, 0.6352941176470588, 0.4470588235294118, 1.0]],
-#                [17, [0.7686274509803922, 0.6352941176470588, 0.4470588235294118, 1.0]],
-#                [18, [0.0, 0.0, 1.0, 1.0]],
-#                [20, [1.0, 1.0, 1.0, 1.0]],
-#                [27, [0.0, 1.0, 1.0, 1.0]],
-#                [30, [0.7843137254901961, 0.7843137254901961, 0.7843137254901961, 1.0]],
-#                [31, [0.39215686274509803, 0.39215686274509803, 0.39215686274509803, 1.0]],
-#                [88, [0.7058823529411765, 0.0, 0.9019607843137255, 1.0]],
-#                [100, [0.19607843137254902, 1.0, 0.39215686274509803, 1.0]],
-#                [120, [0.19607843137254902, 1.0, 0.39215686274509803, 1.0]],
-#                [121, [0.0, 1.0, 0.0, 1.0]],
-#                [130, [0.0, 1.0, 0.0, 1.0]],
-#                [131, [0.7843137254901961, 1.0, 0.0, 1.0]],
-#                [140, [0.7843137254901961, 1.0, 0.0, 1.0]],
-#                [141, [1.0, 1.0, 0.5882352941176471, 1.0]],
-#                [150, [1.0, 1.0, 0.5882352941176471, 1.0]],
-#                [151, [1.0, 1.0, 0.0, 1.0]],
-#                [160, [1.0, 1.0, 0.0, 1.0]],
-#                [161, [1.0, 0.7843137254901961, 0.0, 1.0]],
-#                [170, [1.0, 0.7843137254901961, 0.0, 1.0]],
-#                [171, [1.0, 0.5882352941176471, 0.19607843137254902, 1.0]],
-#                [180, [1.0, 0.5882352941176471, 0.19607843137254902, 1.0]],
-#                [181, [1.0, 0.39215686274509803, 0.0, 1.0]],
-#                [190, [1.0, 0.39215686274509803, 0.0, 1.0]],
-#                [191, [1.0, 0.0, 0.0, 1.0]],
-#                [200, [1.0, 0.0, 0.0, 1.0]],
-#                [201, [0.0, 0.0, 0.0, 0.0]]],
-#                min_value: 0,
-#                max_value: 201}
+        palettes: {
+          values: [
+            14,
+            15,
+            16,
+            17,
+            18,
+            20,
+            27,
+            30,
+            31,
+            88,
+            100,
+            120,
+            121,
+            130,
+            131,
+            140,
+            141,
+            150,
+            151,
+            160,
+            161,
+            170,
+            171,
+            180,
+            181,
+            190,
+            191,
+            200,
+            201,
+          ],
+          colors: [
+            [0.0, 0.0, 0.0],
+            [0.0, 0.0, 0.39215686274509803],
+            [0.7686274509803922, 0.6352941176470588, 0.4470588235294118],
+            [0.7686274509803922, 0.6352941176470588, 0.4470588235294118],
+            [0.0, 0.0, 1.0],
+            [1.0, 1.0, 1.0],
+            [0.0, 1.0, 1.0],
+            [0.7843137254901961, 0.7843137254901961, 0.7843137254901961],
+            [0.39215686274509803, 0.39215686274509803, 0.39215686274509803],
+            [0.7058823529411765, 0.0, 0.9019607843137255],
+            [0.19607843137254902, 1.0, 0.39215686274509803],
+            [0.19607843137254902, 1.0, 0.39215686274509803],
+            [0.0, 1.0, 0.0],
+            [0.0, 1.0, 0.0],
+            [0.7843137254901961, 1.0, 0.0],
+            [0.7843137254901961, 1.0, 0.0],
+            [1.0, 1.0, 0.5882352941176471],
+            [1.0, 1.0, 0.5882352941176471],
+            [1.0, 1.0, 0.0],
+            [1.0, 1.0, 0.0],
+            [1.0, 0.7843137254901961, 0.0],
+            [1.0, 0.7843137254901961, 0.0],
+            [1.0, 0.5882352941176471, 0.19607843137254902],
+            [1.0, 0.5882352941176471, 0.19607843137254902],
+            [1.0, 0.39215686274509803, 0.0],
+            [1.0, 0.39215686274509803, 0.0],
+            [1.0, 0.0, 0.0],
+            [1.0, 0.0, 0.0],
+            [0.0, 0.0, 0.0],
+          ],
+          min_value: 0,
+          max_value: 201}