diff --git a/Index.ipynb b/Index.ipynb index 153f387b52a9ef0a8207db8bcc91b929f57a3a9f..cb8e81852495fefe1d8b9288152fe8c05f4655f7 100644 --- a/Index.ipynb +++ b/Index.ipynb @@ -23,7 +23,7 @@ "- [Lecture 11 - Uncertain System Analysis](./lectures/11_UncertainSystemAnalysis/Lecture_SimExample_UncertainSystemAnalysis.ipynb)\n", "\n", "Exercise Examples:\n", - "- [Exercice 3 - ResistiveCompanion -Task 1](./exercises/03_ResistiveCompanion/Exercise_SimExample_ResistiveCompanion_Task1.ipynb)\n", + "- [Exercise 3 - Resistive Companion - Task 1](./exercises/03_ResistiveCompanion/Exercise_SimExample_ResistiveCompanion_Task1.ipynb)\n", "- [Exercise 6 - Diakoptics - Extra Task](./exercises/06_Diakoptics_ExtraTask/Exercise_SimExample_Diakoptics_ExtraTask.ipynb)\n", "- [Exercise 7 - LIM - Extra Task](./exercises/07_LIM_ExtraTask/Exercise_SimExample_LIM_Exercise_ExtraTask.ipynb)\n", "- [Exercise 8 - Numerical Integration](./exercises/08_NumInt/Exercise_SimExample_NumInt_example.ipynb)\n", diff --git a/exercises/03_ResistiveCompanion/Exercise_SimExample_ResistiveCompanion_Task1.ipynb b/exercises/03_ResistiveCompanion/Exercise_SimExample_ResistiveCompanion_Task1.ipynb index 3ac22ff25340b082f4722feb19ae166ca06b0db2..ba5f22c483f7ad44b80ab6ffc333d8148c464ba5 100644 --- a/exercises/03_ResistiveCompanion/Exercise_SimExample_ResistiveCompanion_Task1.ipynb +++ b/exercises/03_ResistiveCompanion/Exercise_SimExample_ResistiveCompanion_Task1.ipynb @@ -4,7 +4,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "# MSP Simulation Example - Resistive Companion -" + "# MSP Simulation Example - Resistive Companion - Task 1" ] }, { @@ -25,10 +25,11 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "$R_1$ $=0.2 \\Omega$ <br>\n", - "$L_1$ $=1mH$ <br>\n", - "$I_1$$=10A$ <br> \n", - "$i_L(0)=0 $ <br>" + "$R$ $=0.2 \\Omega$ <br>\n", + "$L$ $=1mH$ <br>\n", + "$I$$=10A$ <br> \n", + "$i_L(0)=0 $ <br>\n", + "$\\Delta t = 0.1ms$ <br>" ] }, { @@ -49,11 +50,11 @@ "import matplotlib.pyplot as plt\n", "np.set_printoptions(sign=' ')\n", "\n", - "# Circuit parameters\n", + "# Parameters\n", "R1 = 0.2\n", "L1 = 1e-3\n", "I_src= 10\n", - "\n", + "time_step = 1e-4\n", "G1 = 1/R1\n" ] }, @@ -82,7 +83,7 @@ "\n", "### Application of trapezoidal rule: \n", "\n", - "$i_L(k)= i_L(k) + \\frac{1}{L} \\frac{v_L(k)+v_L(k+1)}{2} \\Delta{t} $\n", + "$i_L(k+1)= i_L(k) + \\frac{1}{L} \\frac{v_L(k)+v_L(k+1)}{2} \\Delta{t} $\n", "\n", "$i_L(k+1)=\\frac{\\Delta{t}}{2L} v_L(k+1) + (i_L(k) + \\frac{\\Delta{t}}{2L} v_L(k)) $\n", "\n", @@ -115,7 +116,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "b1174390d53c43ba84574ecbde14157f", + "model_id": "d0f806c72d7f457982eca7be2f76dae5", "version_major": 2, "version_minor": 0 }, @@ -129,7 +130,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "d7851ddde8b445a1bfef2bf7cf7b9f78", + "model_id": "a32ab910533d4b72bacb5bc0a89ed4f9", "version_major": 2, "version_minor": 0 }, @@ -144,12 +145,11 @@ "source": [ "#Perform simulation with dpsim\n", "import dpsim\n", - "\n", - "#Assign slider values to simulation parameters\n", "model_name = 'CS_R1L1'\n", - "time_step = 1e-4\n", + "\n", "#Set final time to calculate first two simulation steps\n", "final_time = 2e-4\n", + "\n", "#Number of simulation steps\n", "npoint = int(np.round(final_time/time_step))\n", "\n", @@ -250,7 +250,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 5, "metadata": {}, "outputs": [ {