From 9bc393000d68f2bb1ad1541defb1661334baf274 Mon Sep 17 00:00:00 2001
From: ghosh97 <supriyo.ghosh@bsc.es>
Date: Fri, 10 Jul 2026 16:30:05 +0200
Subject: [PATCH] Add CMIP6Plus configuration and dataset mapping in ESGF
 facets

- Introduced CMIP6Plus project configuration in data-esmvalcore-esgf.yml.
- Added CMIP6Plus facets mapping in facets.py.
- Updated dataset map to include CMIP6Plus with appropriate priority and mappings.
---
 .../config/configurations/data-esmvalcore-esgf.yml   |  2 ++
 esmvalcore/io/esgf/facets.py                         | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/esmvalcore/config/configurations/data-esmvalcore-esgf.yml b/esmvalcore/config/configurations/data-esmvalcore-esgf.yml
index 909b871f40..7635fc559f 100644
--- a/esmvalcore/config/configurations/data-esmvalcore-esgf.yml
+++ b/esmvalcore/config/configurations/data-esmvalcore-esgf.yml
@@ -9,6 +9,8 @@ projects:
         # Use a lower priority than for esmvalcore.io.local.LocalDataSource
         # to avoid searching ESGF with the setting `search_esgf: when_missing`.
         priority: 10
+  CMIP6Plus:
+    <<: *esgf-pyclient-data
   CMIP5:
     <<: *esgf-pyclient-data
   CMIP3:
diff --git a/esmvalcore/io/esgf/facets.py b/esmvalcore/io/esgf/facets.py
index 3505fe4ed2..f02c16b4d9 100644
--- a/esmvalcore/io/esgf/facets.py
+++ b/esmvalcore/io/esgf/facets.py
@@ -37,6 +37,16 @@
         "mip": "table_id",
         "short_name": "variable",
     },
+    "CMIP6Plus": {
+        "activity": "activity_drs",
+        "dataset": "source_id",
+        "ensemble": "member_id",
+        "exp": "experiment_id",
+        "institute": "institution_id",
+        "grid": "grid_label",
+        "mip": "table_id",
+        "short_name": "variable",
+    },
     "CMIP7": {
         "activity": "activity_id",
         "branding_suffix": "branding_suffix",
@@ -89,6 +99,7 @@
         "MRI-AGCM3-2S": "MRI-AGCM3.2S",
     },
     "CMIP6": {},
+    "CMIP6Plus": {},
     "CORDEX": {},
     "obs4MIPs": {},
 }
@@ -110,6 +121,7 @@ def create_dataset_map():
         "CMIP3": 2,
         "CMIP5": 3,
         "CMIP6": 3,
+        "CMIP6Plus": 3,
         "CORDEX": 7,
         "obs4MIPs": 2,
     }