Merge branch 'main' into update-pixi

Author: schlunma

.github/workflows/check-rtw.yml

@@ -43,7 +43,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup Cylc
-        uses: cylc/setup-cylc@99ce72c7841aa3f222420d2df16fa31a31f76fde # v1.0.1
+        uses: cylc/setup-cylc@813acd1873cef608f14e354cec57e2de5a7eb3bf # v1.0.2
         with:
           cylc_rose: true
 

.github/workflows/pypi-build-and-deploy.yml

@@ -23,7 +23,7 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
       - name: Set up Python
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: "3.x"
       - name: Install pypa/build

.github/workflows/run-tests-monitor.yml

@@ -40,7 +40,7 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
-      - uses: prefix-dev/setup-pixi@5185adfbffb4bd703da3010310260805d89ebb11  # v0.9.6
+      - uses: prefix-dev/setup-pixi@a09b6247153796b190642a2b53fac4241043cf6f  # v0.10.0
         with:
           frozen: true
           environments: ${{ matrix.environment }}

.github/workflows/test-development.yml

@@ -32,7 +32,7 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
-      - uses: prefix-dev/setup-pixi@5185adfbffb4bd703da3010310260805d89ebb11  # v0.9.6
+      - uses: prefix-dev/setup-pixi@a09b6247153796b190642a2b53fac4241043cf6f  # v0.10.0
         with:
           frozen: true
           environments: esmvalcore-dev

.github/workflows/test.yml

@@ -39,7 +39,7 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
-      - uses: prefix-dev/setup-pixi@5185adfbffb4bd703da3010310260805d89ebb11 # v0.9.6
+      - uses: prefix-dev/setup-pixi@a09b6247153796b190642a2b53fac4241043cf6f # v0.10.0
         with:
           frozen: true
           environments: ${{ matrix.environment }}

.github/workflows/update-lockfiles.yml

@@ -19,7 +19,7 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
       - name: Set up pixi
-        uses: prefix-dev/setup-pixi@5185adfbffb4bd703da3010310260805d89ebb11 # v0.9.6
+        uses: prefix-dev/setup-pixi@a09b6247153796b190642a2b53fac4241043cf6f # v0.10.0
         with:
           run-install: false
       - name: Update lockfiles

.github/workflows/zizmor.yml

@@ -18,6 +18,6 @@ jobs:
           persist-credentials: false
 
       - name: Run zizmor 🌈
-        uses: zizmorcore/zizmor-action@5f14fd08f7cf1cb1609c1e344975f152c7ee938d # v0.5.6
+        uses: zizmorcore/zizmor-action@192e21d79ab29983730a13d1382995c2307fbcaa # v0.5.7
         with:
           advanced-security: false

doc/sphinx/source/input.rst

@@ -273,7 +273,7 @@ A list of the datasets for which a CMORizers is available is provided in the fol
 | CERES-SYN1deg                          | rlds, rldscs, rlus, rluscs, rlut, rlutcs, rsds, rsdscs, rsus, rsuscs, rsut, rsutcs (3hr)             |   3  | NCL             |
 |                                        | rlds, rldscs, rlus, rlut, rlutcs, rsds, rsdt, rsus, rsut, rsutcs (Amon)                              |      |                 |
 +----------------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
-| CLARA-AVHRR                            | clt, clivi, clwvi, lwp (Amon)                                                                        |   3  | NCL             |
+| CLARA-AVHRR                            | clt, clivi, clwvi, lwp (Amon, CFday)                                                                 |   3  | Python          |
 +----------------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
 | CLOUDSAT-L2                            | clw, clivi, clwvi, lwp (Amon)                                                                        |   3  | NCL             |
 +----------------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+

doc/sphinx/source/recipes/recipe_ref_fire.rst

@@ -35,6 +35,9 @@ The ConFire model relies on a variety of observational datasets (see references)
 * ESA CCI Biomass
 * ISIMIP3a GSWP3-W5E5 dataset
 
+For the CMIP7 version of the recipe, the time period is chosen to overlap
+with reliable burned area observations, namely GFED5.
+
 Note: If custom ConFire run files are to be used for the diagnostic,
 they need to be present inside the auxiliary directory defined in the
 user configuration file `config_user.yml`.

esmvaltool/cmorizers/data/cmor_config/CLARA-AVHRR.yml

@@ -0,0 +1,56 @@
+# Common global attributes for Cmorizer output
+attributes:
+  dataset_id: CLARA-AVHRR
+  version: A3
+  tier: 2
+  type: sat
+  project_id: OBS6
+  source: "https://cds.climate.copernicus.eu/datasets/satellite-cloud-properties"
+  reference: "clara-a3"
+  comment: ""
+
+variables:
+  # monthly means
+  clivi_month:
+    mip: Amon
+    short_name: clivi
+    raw: iwp_allsky
+    filename: IWPmm{year}*.nc
+  clt_month:
+    mip: Amon
+    short_name: clt
+    raw: cfc
+    filename: CFCmm{year}*.nc
+  lwp_month:
+    mip: Amon
+    short_name: lwp
+    raw: lwp_allsky
+    filename: LWPmm{year}*.nc
+  clwvi_month:
+    mip: Amon
+    short_name: clwvi
+    raw: ['lwp_allsky', 'iwp_allsky']
+    filename: ['LWPmm{year}*.nc', 'IWPmm{year}*.nc']
+    operator: sum
+  # daily means
+  clivi_day:
+    mip: CFday
+    short_name: clivi
+    raw: iwp_allsky
+    filename: IWPdm{year}{month}*.nc
+  clt_day:
+    mip: CFday
+    short_name: clt
+    raw: cfc
+    filename: CFCdm{year}{month}*.nc
+  lwp_day:
+    mip: CFday
+    short_name: lwp
+    raw: lwp_allsky
+    filename: LWPdm{year}{month}*.nc
+  clwvi_day:
+    mip: CFday
+    short_name: clwvi
+    raw: ['lwp_allsky', 'iwp_allsky']
+    filename: ['LWPdm{year}{month}*.nc', 'IWPdm{year}{month}*.nc']
+    operator: sum