fix experiment

bopen · Mar 26, 2024 · c6527de · c6527de
1 parent 4957885
commit c6527de
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/notebooks/wp4/extreme_temperature_indices_future.ipynb b/notebooks/wp4/extreme_temperature_indices_future.ipynb
@@ -262,7 +262,7 @@
     "        + [\n",
     "            {\n",
     "                **request_cordex,\n",
-    "                \"experiment\": \"ssp5_8_5\",\n",
+    "                \"experiment\": \"rcp_8_5\",\n",
     "                \"start_year\": start_year,\n",
     "                \"end_year\": end_year,\n",
     "            }\n",
@@ -280,7 +280,7 @@
     "    )\n",
     "    requests_future = download.split_request(\n",
     "        request_cmip6\n",
-    "        | {\"year\": get_cmip6_years(future_slice), \"experiment\": \"rcp_8_5\"},\n",
+    "        | {\"year\": get_cmip6_years(future_slice), \"experiment\": \"ssp5_8_5\"},\n",
     "        chunks=chunks,\n",
     "    )\n",
     "    request_sim = (\n",

diff --git a/notebooks/wp4/extreme_temperature_indices_future_vs_historical.ipynb b/notebooks/wp4/extreme_temperature_indices_future_vs_historical.ipynb
@@ -254,7 +254,7 @@
     "            + [\n",
     "                {\n",
     "                    **request_cordex,\n",
-    "                    \"experiment\": \"ssp5_8_5\",\n",
+    "                    \"experiment\": \"rcp_8_5\",\n",
     "                    \"start_year\": start_year,\n",
     "                    \"end_year\": end_year,\n",
     "                    model_key: model,\n",
@@ -281,7 +281,7 @@
     "            request_cmip6\n",
     "            | {\n",
     "                \"year\": get_cmip6_years(future_slice),\n",
-    "                \"experiment\": \"rcp_8_5\",\n",
+    "                \"experiment\": \"ssp5_8_5\",\n",
     "                model_key: model,\n",
     "            },\n",
     "            chunks=chunks,\n",
@@ -465,7 +465,6 @@
    "outputs": [],
    "source": [
     "kwargs = {\n",
-    "    \"collection_id\": request_sim[0],\n",
     "    \"chunks\": chunks if collection_id == \"CMIP6\" else None,\n",
     "    \"transform_chunks\": False,\n",
     "    \"transform_func\": compute_indices_and_trends_future_vs_historical,\n",
@@ -478,7 +477,7 @@
     "    \"resample\": False,\n",
     "}\n",
     "ds_regrid = download.download_and_transform(\n",
-    "    requests=[request | {model_key: model_regrid} for request in request_sim[1]],\n",
+    "    *request_grid_out,\n",
     "    **kwargs,\n",
     "    transform_func_kwargs=transform_func_kwargs,\n",
     ")"
@@ -505,20 +504,19 @@
    "source": [
     "interpolated_datasets = []\n",
     "model_datasets = {}\n",
-    "for model in models:\n",
+    "for model, requests in request_sim.items():\n",
     "    print(f\"{model=}\")\n",
     "    # Original model\n",
     "    ds = download.download_and_transform(\n",
-    "        requests=[request | {model_key: model} for request in request_sim[1]],\n",
-    "        **kwargs,\n",
+    "        *requests**kwargs,\n",
     "        transform_func_kwargs=transform_func_kwargs,\n",
     "    )\n",
     "    model_datasets[model] = ds\n",
     "\n",
     "    if model != model_regrid:\n",
     "        # Interpolated model\n",
     "        ds = download.download_and_transform(\n",
-    "            requests=[request | {model_key: model} for request in request_sim[1]],\n",
+    "            *requests,\n",
     "            **kwargs,\n",
     "            transform_func_kwargs=transform_func_kwargs\n",
     "            | {\n",