From 8bec7ef3eb5b25033dddcbd746bfb8c65c361eb8 Mon Sep 17 00:00:00 2001 From: Martin Moraga Date: Thu, 26 Oct 2023 11:46:49 +0200 Subject: [PATCH] resolve rebase errors Signed-off-by: Martin Moraga --- ...SMIB_ReducedOrderSG_VBR_PCM_LoadStep.ipynb | 6 +- .../DP_Slack_PiLine_VSI_with_PF_Init.ipynb | 100 +++++------ .../Circuits/EMT_DP_SP_Slack_PiLine_VSI.ipynb | 8 +- ...MT_DP_Slack_PiLine_VSI_Control_OnOff.ipynb | 16 +- .../EMT_Slack_PiLine_VSI_with_PF_Init.ipynb | 6 +- ...Slack_PiLine_VSI_with_PF_Init_Params.ipynb | 158 +++++++++--------- 6 files changed, 146 insertions(+), 148 deletions(-) diff --git a/examples/Notebooks/Circuits/Compare_DP_SMIB_ReducedOrderSG_VBR_PCM_LoadStep.ipynb b/examples/Notebooks/Circuits/Compare_DP_SMIB_ReducedOrderSG_VBR_PCM_LoadStep.ipynb index b13df6cbd9..541f9787a1 100644 --- a/examples/Notebooks/Circuits/Compare_DP_SMIB_ReducedOrderSG_VBR_PCM_LoadStep.ipynb +++ b/examples/Notebooks/Circuits/Compare_DP_SMIB_ReducedOrderSG_VBR_PCM_LoadStep.ipynb @@ -272,10 +272,8 @@ "\n", " # pi line\n", " pi_line = dpsimpy.dp.ph1.PiLine('PiLine', dpsimpy.LogLevel.debug)\n", - " pi_line.set_parameters(series_resistance=line_resistance,\n", - " series_inductance=line_inductance,\n", - " parallel_capacitance=line_capacitance,\n", - " parallel_conductance=line_conductance)\n", + " pi_line.set_parameters(R=line_resistance, L=line_inductance,\n", + " C=line_capacitance, G=line_conductance)\n", "\n", " # Slack\n", " slack = dpsimpy.dp.ph1.NetworkInjection('slack', dpsimpy.LogLevel.debug)\n", diff --git a/examples/Notebooks/Circuits/DP_Slack_PiLine_VSI_with_PF_Init.ipynb b/examples/Notebooks/Circuits/DP_Slack_PiLine_VSI_with_PF_Init.ipynb index ff637bcfef..edfa8a928b 100644 --- a/examples/Notebooks/Circuits/DP_Slack_PiLine_VSI_with_PF_Init.ipynb +++ b/examples/Notebooks/Circuits/DP_Slack_PiLine_VSI_with_PF_Init.ipynb @@ -2,14 +2,16 @@ "cells": [ { "cell_type": "markdown", + "metadata": {}, "source": [ "# DP Simulation of topology with slack, line and VSI" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "from villas.dataprocessing.readtools import *\n", "from villas.dataprocessing.timeseries import *\n", @@ -18,27 +20,27 @@ "import dpsimpy\n", "\n", "# %matplotlib widget" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "## Simulation" - ], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "### Parameterization" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "final_time = 1.0\n", "time_step = 1e-5\n", @@ -47,20 +49,20 @@ "cmd_scale_P = 1.0\n", "cmd_scale_I = 1.0\n", "V_nom = 20e3" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "### Powerflow for Initialization" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "time_step_pf = final_time\n", "final_time_pf = final_time + time_step_pf\n", @@ -106,20 +108,20 @@ "sim_pf.do_init_from_nodes_and_terminals(False)\n", "sim_pf.add_logger(logger_pf)\n", "sim_pf.run()" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "### Dynamic Simulation" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "time_step_dp = time_step\n", "final_time_dp = final_time + time_step_dp\n", @@ -135,7 +137,7 @@ "extnet_dp.set_parameters(complex(V_nom, 0))\n", "\n", "line_dp = dpsimpy.dp.ph1.PiLine('PiLine', dpsimpy.LogLevel.debug)\n", - "line_dp.set_parameters(series_resistance=0.5*5, series_inductance=(0.5/314)*5, parallel_capacitance=(50e-6/314)*5)\n", + "line_dp.set_parameters(R=0.5*5, L=(0.5/314)*5, C=(50e-6/314)*5)\n", "\n", "pv = dpsimpy.dp.ph1.AvVoltageSourceInverterDQ(\"pv\", \"pv\", dpsimpy.LogLevel.debug, with_trafo=True)\n", "pv.set_parameters(sys_omega=2 * np.pi * 50, sys_volt_nom=V_nom, p_ref=100e3, q_ref=50e3)\n", @@ -208,53 +210,53 @@ "sim_dp.add_event(load_step_event)\n", "sim_dp.add_logger(logger_dp)\n", "sim_dp.run()" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "## PF results" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "modelName = 'DP_Slack_PiLine_VSI_with_PF_Init_PF'\n", "path = 'logs/' + modelName + '/'\n", "dpsim_result_file = path + modelName + '.csv'\n", "\n", "ts_dpsim_pf = read_timeseries_csv(dpsim_result_file)" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "## DP results" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "modelName = 'DP_Slack_PiLine_VSI_with_PF_Init_DP'\n", "path = 'logs/' + modelName + '/'\n", "dpsim_result_file = path + modelName + '.csv'\n", "\n", "ts_dpsim = read_timeseries_csv(dpsim_result_file)" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "fig = plt.figure(figsize=(12,6))\n", "for ts_name, ts_obj in ts_dpsim.items():\n", @@ -268,13 +270,13 @@ "plt.xlabel('Zeit [s]')\n", "plt.ylabel('Spannung [kV]')\n", "plt.show()" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "plt.figure(figsize=(12,6))\n", "for ts_name, ts_obj in ts_dpsim.items():\n", @@ -283,13 +285,13 @@ "plt.xlim(4.999, 5.004)\n", "plt.legend()\n", "plt.show()" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "fig = plt.figure(figsize=(12,6))\n", "ts_5 = ts_dpsim['i12']\n", @@ -303,9 +305,7 @@ "plt.xlabel('Zeit [s]')\n", "plt.ylabel('Stromänderung [A/Zeitschritt]')\n", "plt.show()\n" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "code", @@ -342,6 +342,8 @@ { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "#fig = plt.figure(figsize=(12,6))\n", "\n", @@ -358,13 +360,13 @@ "#plt.xlabel('Zeit [s]')\n", "#plt.ylabel('Stromstärke [A]')\n", "#pass" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "#plt.figure(figsize=(12,6))\n", "\n", @@ -375,16 +377,14 @@ "#plt.xlabel('Frequenz [Hz]')\n", "#plt.ylabel('Gain')\n", "#pass" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, - "source": [], + "metadata": {}, "outputs": [], - "metadata": {} + "source": [] } ], "metadata": { diff --git a/examples/Notebooks/Circuits/EMT_DP_SP_Slack_PiLine_VSI.ipynb b/examples/Notebooks/Circuits/EMT_DP_SP_Slack_PiLine_VSI.ipynb index 35782fdd47..a9a450ae7f 100644 --- a/examples/Notebooks/Circuits/EMT_DP_SP_Slack_PiLine_VSI.ipynb +++ b/examples/Notebooks/Circuits/EMT_DP_SP_Slack_PiLine_VSI.ipynb @@ -130,9 +130,9 @@ "\n", "line_emt = dpsimpy.emt.ph3.PiLine('PiLine', dpsimpy.LogLevel.debug)\n", "line_emt.set_parameters(\n", - " series_resistance=dpsimpy.Math.single_phase_parameter_to_three_phase(0.5*5),\n", - " series_inductance=dpsimpy.Math.single_phase_parameter_to_three_phase((0.5/314)*5),\n", - " parallel_capacitance=dpsimpy.Math.single_phase_parameter_to_three_phase((50e-6/314)*5))\n", + " R=dpsimpy.Math.single_phase_parameter_to_three_phase(0.5*5),\n", + " L=dpsimpy.Math.single_phase_parameter_to_three_phase((0.5/314)*5),\n", + " C=dpsimpy.Math.single_phase_parameter_to_three_phase((50e-6/314)*5))\n", "\n", "pv = dpsimpy.emt.ph3.AvVoltageSourceInverterDQ(\"pv\", \"pv\", dpsimpy.LogLevel.debug, with_trafo=True)\n", "pv.set_parameters(sys_omega=2 * np.pi * 50, sys_volt_nom=V_nom, p_ref=100e3, q_ref=50e3)\n", @@ -326,7 +326,7 @@ "extnet_dp.set_parameters(complex(V_nom, 0))\n", "\n", "line_dp = dpsimpy.dp.ph1.PiLine('PiLine', dpsimpy.LogLevel.debug)\n", - "line_dp.set_parameters(series_resistance=0.5*5, series_inductance=(0.5/314)*5, parallel_capacitance=(50e-6/314)*5)\n", + "line_dp.set_parameters(R=0.5*5, L=(0.5/314)*5, C=(50e-6/314)*5)\n", "\n", "pv = dpsimpy.dp.ph1.AvVoltageSourceInverterDQ(\"pv\", \"pv\", dpsimpy.LogLevel.debug, with_trafo=True)\n", "pv.set_parameters(sys_omega=2 * np.pi * 50, sys_volt_nom=V_nom, p_ref=100e3, q_ref=50e3)\n", diff --git a/examples/Notebooks/Circuits/EMT_DP_Slack_PiLine_VSI_Control_OnOff.ipynb b/examples/Notebooks/Circuits/EMT_DP_Slack_PiLine_VSI_Control_OnOff.ipynb index 23f8cfc2bc..f2680ad1df 100644 --- a/examples/Notebooks/Circuits/EMT_DP_Slack_PiLine_VSI_Control_OnOff.ipynb +++ b/examples/Notebooks/Circuits/EMT_DP_Slack_PiLine_VSI_Control_OnOff.ipynb @@ -140,9 +140,9 @@ "\n", "line_emt = dpsimpy.emt.ph3.PiLine('PiLine', dpsimpy.LogLevel.debug)\n", "line_emt.set_parameters(\n", - " series_resistance=dpsimpy.Math.single_phase_parameter_to_three_phase(0.5*5),\n", - " series_inductance=dpsimpy.Math.single_phase_parameter_to_three_phase((0.5/314)*5),\n", - " parallel_capacitance=dpsimpy.Math.single_phase_parameter_to_three_phase((50e-6/314)*5))\n", + " R=dpsimpy.Math.single_phase_parameter_to_three_phase(0.5*5),\n", + " L=dpsimpy.Math.single_phase_parameter_to_three_phase((0.5/314)*5),\n", + " C=dpsimpy.Math.single_phase_parameter_to_three_phase((50e-6/314)*5))\n", "\n", "pv = dpsimpy.emt.ph3.AvVoltageSourceInverterDQ(\"pv\", \"pv\", dpsimpy.LogLevel.debug, with_trafo=True)\n", "pv.set_parameters(sys_omega=2 * np.pi * 50, sys_volt_nom=V_nom, p_ref=100e3, q_ref=50e3)\n", @@ -336,9 +336,9 @@ "\n", "line_emt = dpsimpy.emt.ph3.PiLine('PiLine', dpsimpy.LogLevel.debug)\n", "line_emt.set_parameters(\n", - " series_resistance=dpsimpy.Math.single_phase_parameter_to_three_phase(0.5*5),\n", - " series_inductance=dpsimpy.Math.single_phase_parameter_to_three_phase((0.5/314)*5),\n", - " parallel_capacitance=dpsimpy.Math.single_phase_parameter_to_three_phase((50e-6/314)*5))\n", + " R=dpsimpy.Math.single_phase_parameter_to_three_phase(0.5*5),\n", + " L=dpsimpy.Math.single_phase_parameter_to_three_phase((0.5/314)*5),\n", + " C=dpsimpy.Math.single_phase_parameter_to_three_phase((50e-6/314)*5))\n", "\n", "pv = dpsimpy.emt.ph3.AvVoltageSourceInverterDQ(\"pv\", \"pv\", dpsimpy.LogLevel.debug, with_trafo=True)\n", "pv.set_parameters(sys_omega=2 * np.pi * 50, sys_volt_nom=V_nom, p_ref=100e3, q_ref=50e3)\n", @@ -722,7 +722,7 @@ "extnet_dp.set_parameters(complex(V_nom, 0))\n", "\n", "line_dp = dpsimpy.dp.ph1.PiLine('PiLine', dpsimpy.LogLevel.debug)\n", - "line_dp.set_parameters(series_resistance=0.5*5, series_inductance=(0.5/314)*5, parallel_capacitance=(50e-6/314)*5)\n", + "line_dp.set_parameters(R=0.5*5, L=(0.5/314)*5, C=(50e-6/314)*5)\n", "\n", "pv = dpsimpy.dp.ph1.AvVoltageSourceInverterDQ(\"pv\", \"pv\", dpsimpy.LogLevel.debug, with_trafo=True)\n", "pv.set_parameters(sys_omega=2 * np.pi * 50, sys_volt_nom=V_nom, p_ref=100e3, q_ref=50e3)\n", @@ -915,7 +915,7 @@ "extnet_dp.set_parameters(complex(V_nom, 0))\n", "\n", "line_dp = dpsimpy.dp.ph1.PiLine('PiLine', dpsimpy.LogLevel.debug)\n", - "line_dp.set_parameters(series_resistance=0.5*5, series_inductance=(0.5/314)*5, parallel_capacitance=(50e-6/314)*5)\n", + "line_dp.set_parameters(R=0.5*5, L=(0.5/314)*5, C=(50e-6/314)*5)\n", "\n", "pv = dpsimpy.dp.ph1.AvVoltageSourceInverterDQ(\"pv\", \"pv\", dpsimpy.LogLevel.debug, with_trafo=True)\n", "pv.set_parameters(sys_omega=2 * np.pi * 50, sys_volt_nom=V_nom, p_ref=100e3, q_ref=50e3)\n", diff --git a/examples/Notebooks/Circuits/EMT_Slack_PiLine_VSI_with_PF_Init.ipynb b/examples/Notebooks/Circuits/EMT_Slack_PiLine_VSI_with_PF_Init.ipynb index d74e43d954..078de7721d 100644 --- a/examples/Notebooks/Circuits/EMT_Slack_PiLine_VSI_with_PF_Init.ipynb +++ b/examples/Notebooks/Circuits/EMT_Slack_PiLine_VSI_with_PF_Init.ipynb @@ -136,9 +136,9 @@ "\n", "line_emt = dpsimpy.emt.ph3.PiLine('PiLine', dpsimpy.LogLevel.debug)\n", "line_emt.set_parameters(\n", - " series_resistance=dpsimpy.Math.single_phase_parameter_to_three_phase(0.5*5),\n", - " series_inductance=dpsimpy.Math.single_phase_parameter_to_three_phase((0.5/314)*5),\n", - " parallel_capacitance=dpsimpy.Math.single_phase_parameter_to_three_phase((50e-6/314)*5))\n", + " R=dpsimpy.Math.single_phase_parameter_to_three_phase(0.5*5),\n", + " L=dpsimpy.Math.single_phase_parameter_to_three_phase((0.5/314)*5),\n", + " C=dpsimpy.Math.single_phase_parameter_to_three_phase((50e-6/314)*5))\n", "\n", "pv = dpsimpy.emt.ph3.AvVoltageSourceInverterDQ(\"pv\", \"pv\", dpsimpy.LogLevel.debug, with_trafo=True)\n", "pv.set_parameters(sys_omega=2 * np.pi * 50, sys_volt_nom=V_nom, p_ref=100e3, q_ref=50e3)\n", diff --git a/examples/Notebooks/Circuits/EMT_Slack_PiLine_VSI_with_PF_Init_Params.ipynb b/examples/Notebooks/Circuits/EMT_Slack_PiLine_VSI_with_PF_Init_Params.ipynb index def43786d9..b150fc8ce2 100644 --- a/examples/Notebooks/Circuits/EMT_Slack_PiLine_VSI_with_PF_Init_Params.ipynb +++ b/examples/Notebooks/Circuits/EMT_Slack_PiLine_VSI_with_PF_Init_Params.ipynb @@ -2,31 +2,33 @@ "cells": [ { "cell_type": "markdown", + "metadata": {}, "source": [ "# Testing control params" - ], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "## Set up simulation" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "import numpy as np\n", "import dpsimpy" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "def EMTSimulation(name, kp, ki):\n", " final_time = 4\n", @@ -95,9 +97,9 @@ "\n", " line_emt = dpsimpy.emt.ph3.PiLine('PiLine', dpsimpy.LogLevel.debug)\n", " line_emt.set_parameters(\n", - " series_resistance=dpsimpy.Math.single_phase_parameter_to_three_phase(0.5*5),\n", - " series_inductance=dpsimpy.Math.single_phase_parameter_to_three_phase((0.5/314)*5),\n", - " parallel_capacitance=dpsimpy.Math.single_phase_parameter_to_three_phase((50e-6/314)*5))\n", + " R=dpsimpy.Math.single_phase_parameter_to_three_phase(0.5*5),\n", + " L=dpsimpy.Math.single_phase_parameter_to_three_phase((0.5/314)*5),\n", + " C=dpsimpy.Math.single_phase_parameter_to_three_phase((50e-6/314)*5))\n", "\n", " pv = dpsimpy.emt.ph3.AvVoltageSourceInverterDQ(\"pv\", \"pv\", dpsimpy.LogLevel.debug, with_trafo=True)\n", " pv.set_parameters(sys_omega=2 * np.pi * 50, sys_volt_nom=V_nom, p_ref=100e3, q_ref=50e3)\n", @@ -171,20 +173,20 @@ " sim_emt.add_event(load_step_event)\n", " sim_emt.add_logger(logger_emt)\n", " sim_emt.run()" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "## Kp study" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "from villas.dataprocessing.readtools import *\n", "from villas.dataprocessing.timeseries import *\n", @@ -197,38 +199,38 @@ "PEAK1PH_TO_RMS3PH = np.sqrt(3.0/2.0)\n", "\n", "scale_kp=np.round(np.arange(0.58,0.68,0.02),2)" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "## Run Simulations" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "for kp in scale_kp:\n", " modelName = 'EMT_Slack_PiLine_VSI_with_PF_Init_KP-'+str(kp)\n", " EMTSimulation(modelName, kp, 1.0)" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "## EMT results" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "ts_dpsim={}\n", "for kp in scale_kp:\n", @@ -236,20 +238,20 @@ " path = 'logs/' + modelName + '/'\n", " dpsim_result_file = path + modelName + '.csv'\n", " ts_dpsim[str(kp)] = read_timeseries_csv(dpsim_result_file)" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "### States - Active Power" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "plt.figure(figsize=(12,6))\n", "\n", @@ -267,20 +269,20 @@ " \n", "plt.legend()\n", "plt.show()" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "### States - Reactive Power" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "plt.figure(figsize=(12,6))\n", "\n", @@ -298,20 +300,20 @@ " \n", "plt.legend()\n", "plt.show()" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "## Ki study" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "from villas.dataprocessing.readtools import *\n", "from villas.dataprocessing.timeseries import *\n", @@ -324,38 +326,38 @@ "PEAK1PH_TO_RMS3PH = np.sqrt(3.0/2.0)\n", "\n", "scale_ki=np.round(np.arange(0.1,2.1,0.2),1)" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "## Run Simulations" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "for ki in scale_ki:\n", " modelName = 'EMT_Slack_PiLine_VSI_with_PF_Init_KI-'+str(ki)\n", " EMTSimulation(modelName, 1.0, ki)" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "## EMT results" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "ts_dpsim={}\n", "for ki in scale_ki:\n", @@ -363,20 +365,20 @@ " path = 'logs/' + modelName + '/'\n", " dpsim_result_file = path + modelName + '.csv'\n", " ts_dpsim[str(ki)] = read_timeseries_csv(dpsim_result_file)" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "### States - Active Power" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "plt.figure(figsize=(12,6))\n", "\n", @@ -394,20 +396,20 @@ " \n", "plt.legend()\n", "plt.show()" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "### States - Reactive Power" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "plt.figure(figsize=(12,6))\n", "\n", @@ -425,20 +427,20 @@ " \n", "plt.legend()\n", "plt.show()" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "## Final choice" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "kp=0.66\n", "ki=1.0\n", @@ -450,20 +452,20 @@ "path = 'logs/' + modelName + '/'\n", "dpsim_result_file = path + modelName + '.csv'\n", "ts_dpsim = read_timeseries_csv(dpsim_result_file)" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "### States - Active Power" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "plt.figure(figsize=(12,6))\n", "\n", @@ -479,20 +481,20 @@ " \n", "plt.legend()\n", "plt.show()" - ], - "outputs": [], - "metadata": {} + ] }, { "cell_type": "markdown", + "metadata": {}, "source": [ "### States - Reactive Power" - ], - "metadata": {} + ] }, { "cell_type": "code", "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "plt.figure(figsize=(12,6))\n", "\n", @@ -508,9 +510,7 @@ " \n", "plt.legend()\n", "plt.show()" - ], - "outputs": [], - "metadata": {} + ] } ], "metadata": { @@ -529,4 +529,4 @@ }, "nbformat": 4, "nbformat_minor": 4 -} \ No newline at end of file +}