Fix calculation of grid_efficiency

iiasa · Jan 7, 2025 · 0109580 · 0109580
1 parent a99a194
commit 0109580
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/tutorial/westeros/_static/historical_new_capacity_and_total_installed_capacity.png b/tutorial/westeros/_static/historical_new_capacity_and_total_installed_capacity.png
diff --git a/tutorial/westeros/_static/historical_new_capacity_and_total_installed_capacity.pptx b/tutorial/westeros/_static/historical_new_capacity_and_total_installed_capacity.pptx
diff --git a/tutorial/westeros/westeros_historical_new_capacity.ipynb b/tutorial/westeros/westeros_historical_new_capacity.ipynb
@@ -292,9 +292,9 @@
    "source": [
     "# We know that there are losses that occur when electricity is transmitted via the\n",
     "# `grid`.\n",
-    "grid_eff = float(\n",
+    "grid_eff = 1 / float(\n",
     "    scenario.par(\n",
-    "        \"output\",\n",
+    "        \"input\",\n",
     "        filters={\n",
     "            \"year_vtg\": scenario.firstmodelyear,\n",
     "            \"year_act\": scenario.firstmodelyear,\n",
@@ -323,7 +323,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Each year within the historical 10 year period, a 11.11 GW `\"coal_ppl\"` must be added to meet the demand of the `firstmodelyear`. Therefore, the value of `\"historical_new_capacity\"` is calculated to `\"historical_new_capacity\" = demand_of_firstmodelyear / \"duration_period\"`."
+    "Each year within the historical 10 year period, a 6.11 GW `\"coal_ppl\"` must be added to meet the demand of the `firstmodelyear`. Therefore, the value of `\"historical_new_capacity\"` is calculated to `\"historical_new_capacity\" = demand_of_firstmodelyear / \"duration_period\"`."
    ]
   },
   {
@@ -344,7 +344,7 @@
     ")\n",
     "print(\n",
     "    \"The `'historical_new_capacity'` for `coal_ppl` is set to \"\n",
-    "    f\"{round(historical_new_capacity, 2)}\"\n",
+    "    f\"{round(historical_new_capacity, 2)} {df[\"unit\"].values}.\"\n",
     ")\n",
     "scenario.add_par(\"historical_new_capacity\", df)"
    ]