Merge pull request #283 from ie3-institute/df/#281-fix-create-grid

Fix create_grid notebook to psdm changes with respect to em

Author: t-ober

CHANGELOG.md

@@ -19,6 +19,7 @@ All notable changes to this project will be documented in this file.
 - Adapt to recent PSDM changes with regard to energy management systems [#164](https://github.com/ie3-institute/pypsdm/issue/164)
 - Removed node from create method of energy management systems [#267](https://github.com/ie3-institute/pypsdm/issue/267)
 - Changed default value for `cos_Phi` of create method of `ElectricVehicleChargingStations` to 1.0 [#272](https://github.com/ie3-institute/pypsdm/issue/272) 
+- Fix `create_grid` notebook to PSDM changes with respect to Em [#281](https://github.com/ie3-institute/pypsdm/issues/281) 
 
 ### Removed
 

nbs/create_grid.ipynb

@@ -64,9 +64,26 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pypsdm.models.input.create.participants import create_pvs\n",
+    "from pypsdm.models.input.create.participants import create_energy_management_systems\n",
+    "\n",
+    "em_uuids = [\"74d45b31-c35b-403b-96ac-5210754eb4de\",\"093e03ee-2d38-4e91-9f44-c71d92c07d89\",\"22af972d-19a8-415d-8c0a-50fa1238a7d9\"]\n",
     "\n",
-    "from pypsdm.models.input.participant.pv import PhotovoltaicPowerPlants\n",
+    "data_dict = {\n",
+    "    \"uuid\": em_uuids,\n",
+    "    \"id\": [\"EMS_NS_02\", \"EMS_NS_03\", \"EMS_NS_04\"],\n",
+    "    \"control_strategy\": [\"PRIORITIZED\", \"PRIORITIZED\", \"PRIORITIZED\"],\n",
+    "}\n",
+    "\n",
+    "emss = create_energy_management_systems(data_dict)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from pypsdm.models.input.create.participants import create_pvs\n",
     "\n",
     "pv_s_rated = [4, 6, 10]\n",
     "\n",
@@ -76,6 +93,7 @@
     "    \"s_rated\": pv_s_rated,\n",
     "    \"azimuth\": [90, 0, -90],\n",
     "    \"elevation_angle\": [40, 45, 30],\n",
+    "    \"em\": em_uuids,\n",
     "}\n",
     "\n",
     "pvs = create_pvs(data_dict)"
@@ -94,6 +112,7 @@
     "    \"id\": [\"BS_NS_02\", \"BS_NS_03\", \"BS_NS_04\"],\n",
     "    \"node\": [node_2, node_3, node_4],\n",
     "    \"e_storage\": [1.5 * pv_power for pv_power in pv_s_rated],\n",
+    "    \"em\": em_uuids,\n",
     "}\n",
     "\n",
     "bs = create_storages(data_dict)"
@@ -114,6 +133,7 @@
     "    \"id\": [\"EV_NS_02\", \"EV_NS_03\", \"EV_NS_04\"],\n",
     "    \"node\": [node_2, node_3, node_4],\n",
     "    \"s_rated\": ev_s_rated,\n",
+    "    \"s_ratedDC\": ev_s_rated,\n",
     "    \"e_storage\": [80, 70, 100],\n",
     "    \"e_cons\": [20, 16, 19],\n",
     "}\n",
@@ -127,7 +147,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pipes import Template\n",
     "from pypsdm.models.input.create.participants import create_ev_charging_stations\n",
     "from pypsdm.models.input.participant.evcs import EvcsLocationType\n",
     "\n",
@@ -140,6 +159,7 @@
     "        EvcsLocationType.HOME.value,\n",
     "    ],\n",
     "    \"s_rated\": [10, 10, 10],\n",
+    "    \"em\": em_uuids,\n",
     "}\n",
     "\n",
     "evcs = create_ev_charging_stations(data_dict)"
@@ -184,6 +204,7 @@
     "    \"node\": [node_2, node_3, node_4],\n",
     "    \"thermal_bus\": list(tbs.uuid),\n",
     "    \"s_rated\": [4, 3, 6],\n",
+    "    \"em\": em_uuids,\n",
     "}\n",
     "\n",
     "hps = create_heat_pumps(data_dict)"
@@ -223,6 +244,7 @@
     "    \"s_rated\": [3, 3, 3],\n",
     "    \"e_cons_annual\": [3000, 3500, 4000],\n",
     "    \"load_profile\": [\"h0\", \"h0\", \"h0\"],\n",
+    "    \"em\": em_uuids,\n",
     "}\n",
     "\n",
     "loads = create_loads(load_data_dict)"
@@ -238,7 +260,6 @@
     "from pypsdm.models.input.participant.bm import BiomassPlants\n",
     "from pypsdm.models.input.participant.em import EnergyManagementSystems\n",
     "from pypsdm.models.input.participant.fixed_feed_in import FixedFeedIns\n",
-    "from pypsdm.models.input.participant.load import Loads\n",
     "from pypsdm.models.input.participant.wec import WindEnergyConverters\n",
     "\n",
     "\n",
@@ -281,27 +302,6 @@
     "    node_connected_assets[node] = participant_uuids"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "from pypsdm.models.input.create.participants import create_energy_management_systems\n",
-    "\n",
-    "\n",
-    "data_dict = {\n",
-    "    \"id\": [\"EMS_NS_02\", \"EMS_NS_03\", \"EMS_NS_04\"],\n",
-    "    \"node\": [node_2, node_3, node_4],\n",
-    "    \"connected_assets\": [\n",
-    "        node_connected_assets[node] for node in [node_2, node_3, node_4]\n",
-    "    ],\n",
-    "    \"control_strategy\": [\"self_optimization\", \"self_optimization\", \"self_optimization\"],\n",
-    "}\n",
-    "\n",
-    "emss = create_energy_management_systems(data_dict)"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -354,6 +354,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "import os\n",
+    "\n",
+    "if not os.path.exists(target_grid_path):\n",
+    "    os.mkdir(target_grid_path)\n",
     "updated_grid.to_csv(target_grid_path, include_primary_data=False)\n",
     "tg.to_csv(target_grid_path)"
    ]
@@ -362,7 +366,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# EV Mobility Points of Interest"
+    "# EV Mobility Points of Interest\n"
    ]
   },
   {

pypsdm/models/input/create/participants.py

@@ -300,7 +300,7 @@ def create_heat_pumps_data(
             "s_rated": s_rated,
             "cos_phi_rated": cos_phi_rated,
             "p_thermal": p_thermal,
-            "em=": em,
+            "em": em,
         }
     ).rename(uuid)