diff --git a/Index.ipynb b/Index.ipynb
index c5962fbe80f163106aaf7424eedd2ba6fa9cdab2..cf967c34cdd90912076d1c7fbd3855fd91358f56 100644
--- a/Index.ipynb
+++ b/Index.ipynb
@@ -13,7 +13,7 @@
"Lecture Examples:\n",
"- [Lecture 2 - Modified Nodal Analysis - without DPsim](./lectures/02_NA_MNA/Lecture_SimExample_MNA_withoutDPsim.ipynb)\n",
"- [Lecture 2 - Modified Nodal Analysis - with DPsim](./lectures/02_NA_MNA/Lecture_SimExample_MNA_DPsim.ipynb)\n",
- "- [Lecture 3 - Resistive Companion - automated](./lectures/03_ResistiveCompanion/Lecture_SimExample_ResistiveCompanion_automated.ipynb)\n",
+ "- [Lecture 3 - Resistive Companion](./lectures/03_ResistiveCompanion/Lecture_SimExample_ResistiveCompanion_automated.ipynb)\n",
"- [Lecture 4 - Nonlinear Resistive Companion](./lectures/04_NLResistiveCompanion/Lecture_SimExample_NLResistiveCompanion.ipynb)\n",
"- [Lecture 5 - State Space Equations](./lectures/05_StateSpace/Lecture_SimExample_StateSpace.ipynb)\n",
"- [Lecture 8 - Dynamic Phasors](./lectures/08_DecoupledELMESim/Lecture_SimExample_DecoupledELMESim.ipynb)\n",
diff --git a/lectures/02_NA_MNA/Lecture_SimExample_MNA_DPsim.ipynb b/lectures/02_NA_MNA/Lecture_SimExample_MNA_DPsim.ipynb
index ea9f40d8d369979841069df9d754ee6aa6c7f78a..75a3541257aa133ae9bee76cc2b2bee9a16a09d2 100644
--- a/lectures/02_NA_MNA/Lecture_SimExample_MNA_DPsim.ipynb
+++ b/lectures/02_NA_MNA/Lecture_SimExample_MNA_DPsim.ipynb
@@ -26,7 +26,7 @@
"metadata": {},
"source": [
"$R_1$=$1 \\Omega$, $R_2$=$1 \\Omega$, $R_3$=$10 \\Omega$, $R_4$=$5 \\Omega$ \n",
- "$I_1$=$1 A$, $V_{in}$=$1 V$"
+ "$I_1$=$1 A$, $V_{0}$=$10 V$"
]
},
{
@@ -51,7 +51,7 @@
{
"data": {
"application/vnd.jupyter.widget-view+json": {
- "model_id": "178a92e5e15747c4a40e48caa73b134d",
+ "model_id": "b35663df21a0440f9115443449650c99",
"version_major": 2,
"version_minor": 0
},
@@ -65,7 +65,7 @@
{
"data": {
"application/vnd.jupyter.widget-view+json": {
- "model_id": "86bb9bbc631545b69deb6bf13c81830b",
+ "model_id": "55c29c1c07be44739961c66de07780c1",
"version_major": 2,
"version_minor": 0
},
@@ -123,7 +123,7 @@
"logger.log_attribute(r1, 'i_intf');\n",
"logger.log_attribute(r3, 'i_intf');\n",
"\n",
- "sim = dpsim.Simulation(model_name, system, timestep=time_step, duration=final_time, pbar=True, sim_type=1, log_level=4)\n",
+ "sim = dpsim.Simulation(model_name, system, timestep=time_step, duration=final_time, pbar=True, sim_type=1, log_level=1)\n",
"sim.add_logger(logger)\n",
"\n",
"sim.start()"
@@ -153,8 +153,8 @@
"from villas.dataprocessing.timeseries import *\n",
"import re\n",
"\n",
- "work_dir = 'Logs/'\n",
- "log_path = work_dir + model_name + '_MNA.log'\n",
+ "work_dir = 'logs/'\n",
+ "log_path = work_dir + model_name + '_Solver.log'\n",
"log_lines, log_sections = read_dpsim_log(log_path)"
]
},
@@ -174,18 +174,13 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "INFO: #### Start Initialization ####\n",
- "INFO: Found node n1\n",
- "INFO: Found node n2\n",
- "INFO: Found node n3\n",
- "INFO: Created virtual node0 = 3 for vs\n",
- "INFO: Number of network nodes: 3\n",
- "INFO: Number of nodes: 4\n"
+ "[I] Number of network nodes: 3\n",
+ "[I] Number of network and virtual nodes: 4\n"
]
}
],
"source": [
- "for line_pos in log_sections['init']:\n",
+ "for line_pos in log_sections['nodenumbers']:\n",
" print(log_lines[line_pos])"
]
},
@@ -198,43 +193,43 @@
},
{
"cell_type": "code",
- "execution_count": 12,
+ "execution_count": 4,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
- "DEBUG: Stamping EMT::Ph1::VoltageSource vs into system matrix:\n",
- "0 0 0 1\n",
- "0 0 0 0\n",
- "0 0 0 0\n",
- "1 0 0 0\n",
- "DEBUG: Stamping EMT::Ph1::Resistor r1 into system matrix:\n",
- " 1 -1 0 1\n",
- "-1 1 0 0\n",
- " 0 0 0 0\n",
- " 1 0 0 0\n",
- "DEBUG: Stamping EMT::Ph1::Resistor r2 into system matrix:\n",
- " 1 -1 0 1\n",
- "-1 2 0 0\n",
- " 0 0 0 0\n",
- " 1 0 0 0\n",
- "DEBUG: Stamping EMT::Ph1::Resistor r3 into system matrix:\n",
- " 1 -1 0 1\n",
- " -1 2.1 -0.1 0\n",
- " 0 -0.1 0.1 0\n",
- " 1 0 0 0\n",
- "DEBUG: Stamping EMT::Ph1::Resistor r4 into system matrix:\n",
- " 1 -1 0 1\n",
- " -1 2.1 -0.1 0\n",
- " 0 -0.1 0.3 0\n",
- " 1 0 0 0\n",
- "DEBUG: Stamping EMT::Ph1::CurrentSource cs into system matrix:\n",
- " 1 -1 0 1\n",
- " -1 2.1 -0.1 0\n",
- " 0 -0.1 0.3 0\n",
- " 1 0 0 0\n"
+ "[D] Stamping EMT::Ph1::VoltageSource vs into system matrix:\n",
+ "0.000000e+00 0.000000e+00 0.000000e+00 1.000000e+00\n",
+ "0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00\n",
+ "0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00\n",
+ "1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00\n",
+ "[D] Stamping EMT::Ph1::Resistor r1 into system matrix:\n",
+ " 1.000000e+00 -1.000000e+00 0.000000e+00 1.000000e+00\n",
+ "-1.000000e+00 1.000000e+00 0.000000e+00 0.000000e+00\n",
+ " 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00\n",
+ " 1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00\n",
+ "[D] Stamping EMT::Ph1::Resistor r2 into system matrix:\n",
+ " 1.000000e+00 -1.000000e+00 0.000000e+00 1.000000e+00\n",
+ "-1.000000e+00 2.000000e+00 0.000000e+00 0.000000e+00\n",
+ " 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00\n",
+ " 1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00\n",
+ "[D] Stamping EMT::Ph1::Resistor r3 into system matrix:\n",
+ " 1.000000e+00 -1.000000e+00 0.000000e+00 1.000000e+00\n",
+ "-1.000000e+00 2.100000e+00 -1.000000e-01 0.000000e+00\n",
+ " 0.000000e+00 -1.000000e-01 1.000000e-01 0.000000e+00\n",
+ " 1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00\n",
+ "[D] Stamping EMT::Ph1::Resistor r4 into system matrix:\n",
+ " 1.000000e+00 -1.000000e+00 0.000000e+00 1.000000e+00\n",
+ "-1.000000e+00 2.100000e+00 -1.000000e-01 0.000000e+00\n",
+ " 0.000000e+00 -1.000000e-01 3.000000e-01 0.000000e+00\n",
+ " 1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00\n",
+ "[D] Stamping EMT::Ph1::CurrentSource cs into system matrix:\n",
+ " 1.000000e+00 -1.000000e+00 0.000000e+00 1.000000e+00\n",
+ "-1.000000e+00 2.100000e+00 -1.000000e-01 0.000000e+00\n",
+ " 0.000000e+00 -1.000000e-01 3.000000e-01 0.000000e+00\n",
+ " 1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00\n"
]
}
],
@@ -252,43 +247,43 @@
},
{
"cell_type": "code",
- "execution_count": 13,
+ "execution_count": 5,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
- "DEBUG: Stamping EMT::Ph1::VoltageSource vs into source vector:\n",
- " 0\n",
- " 0\n",
- " 0\n",
- "10\n",
- "DEBUG: Stamping EMT::Ph1::Resistor r1 into source vector:\n",
- " 0\n",
- " 0\n",
- " 0\n",
- "10\n",
- "DEBUG: Stamping EMT::Ph1::Resistor r2 into source vector:\n",
- " 0\n",
- " 0\n",
- " 0\n",
- "10\n",
- "DEBUG: Stamping EMT::Ph1::Resistor r3 into source vector:\n",
- " 0\n",
- " 0\n",
- " 0\n",
- "10\n",
- "DEBUG: Stamping EMT::Ph1::Resistor r4 into source vector:\n",
- " 0\n",
- " 0\n",
- " 0\n",
- "10\n",
- "DEBUG: Stamping EMT::Ph1::CurrentSource cs into source vector:\n",
- " 0\n",
- " 0\n",
- " 1\n",
- "10\n"
+ "[D] Stamping EMT::Ph1::VoltageSource vs into source vector:\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(1.000000e+01,0.000000e+00)\n",
+ "[D] Stamping EMT::Ph1::Resistor r1 into source vector:\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(1.000000e+01,0.000000e+00)\n",
+ "[D] Stamping EMT::Ph1::Resistor r2 into source vector:\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(1.000000e+01,0.000000e+00)\n",
+ "[D] Stamping EMT::Ph1::Resistor r3 into source vector:\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(1.000000e+01,0.000000e+00)\n",
+ "[D] Stamping EMT::Ph1::Resistor r4 into source vector:\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(1.000000e+01,0.000000e+00)\n",
+ "[D] Stamping EMT::Ph1::CurrentSource cs into source vector:\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(0.000000e+00,0.000000e+00)\n",
+ "(1.000000e+00,0.000000e+00)\n",
+ "(1.000000e+01,0.000000e+00)\n"
]
}
],
@@ -306,23 +301,23 @@
},
{
"cell_type": "code",
- "execution_count": 14,
+ "execution_count": 6,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
- "INFO: System matrix:\n",
- " 1 -1 0 1\n",
- " -1 2.1 -0.1 0\n",
- " 0 -0.1 0.3 0\n",
- " 1 0 0 0\n",
- "INFO: LU decomposition:\n",
- " 1 -1 0 1\n",
- " -1 1.1 -0.1 1\n",
- " 0 -0.0909091 0.290909 0.0909091\n",
- " 1 0.909091 0.3125 -1.9375\n"
+ "[I] System matrix:\n",
+ " 1.000000e+00 -1.000000e+00 0.000000e+00 1.000000e+00\n",
+ "-1.000000e+00 2.100000e+00 -1.000000e-01 0.000000e+00\n",
+ " 0.000000e+00 -1.000000e-01 3.000000e-01 0.000000e+00\n",
+ " 1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00\n",
+ "[I] LU decomposition:\n",
+ " 1.000000e+00 -1.000000e+00 0.000000e+00 1.000000e+00\n",
+ "-1.000000e+00 1.100000e+00 -1.000000e-01 1.000000e+00\n",
+ " 0.000000e+00 -9.090909e-02 2.909091e-01 9.090909e-02\n",
+ " 1.000000e+00 9.090909e-01 3.125000e-01 -1.937500e+00\n"
]
}
],
@@ -342,7 +337,7 @@
},
{
"cell_type": "code",
- "execution_count": 15,
+ "execution_count": 7,
"metadata": {},
"outputs": [
{
@@ -358,13 +353,20 @@
}
],
"source": [
- "work_dir = 'Logs/'\n",
+ "work_dir = 'logs/'\n",
"model_name = 'EMT_VS_CS_R4_AC'\n",
"log_path = work_dir + model_name + '.csv'\n",
"ts_dpsim_emt = read_timeseries_dpsim(log_path, print_status=False)\n",
"for key, val in ts_dpsim_emt.items():\n",
" print(key + ': ' + str(val.values[0]))"
]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {},
+ "outputs": [],
+ "source": []
}
],
"metadata": {
diff --git a/lectures/03_ResistiveCompanion/Lecture_SimExample_ResistiveCompanion_automated.ipynb b/lectures/03_ResistiveCompanion/Lecture_SimExample_ResistiveCompanion_automated.ipynb
index 65092a0224c4b7eeaa6dcc930251c168b8e0df15..1f762967c0b1557a8da7b59c009ea5a25934b05b 100644
--- a/lectures/03_ResistiveCompanion/Lecture_SimExample_ResistiveCompanion_automated.ipynb
+++ b/lectures/03_ResistiveCompanion/Lecture_SimExample_ResistiveCompanion_automated.ipynb
@@ -4,7 +4,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
- "# MSP Simulation Example - Resistive Companion - automated"
+ "# MSP Simulation Example - Resistive Companion"
]
},
{
@@ -39,7 +39,7 @@
},
{
"cell_type": "code",
- "execution_count": 1,
+ "execution_count": 6,
"metadata": {},
"outputs": [],
"source": [
@@ -76,7 +76,7 @@
},
{
"cell_type": "code",
- "execution_count": 2,
+ "execution_count": 7,
"metadata": {},
"outputs": [],
"source": [
@@ -138,7 +138,7 @@
},
{
"cell_type": "code",
- "execution_count": 3,
+ "execution_count": 8,
"metadata": {},
"outputs": [],
"source": [
@@ -195,7 +195,7 @@
},
{
"cell_type": "code",
- "execution_count": 4,
+ "execution_count": 9,
"metadata": {},
"outputs": [],
"source": [
@@ -254,13 +254,13 @@
},
{
"cell_type": "code",
- "execution_count": 5,
+ "execution_count": 10,
"metadata": {},
"outputs": [
{
"data": {
"application/vnd.jupyter.widget-view+json": {
- "model_id": "96f4a5e1a0f44fec8446ca1b2a713e72",
+ "model_id": "17d540b328594667ab10081c8d2e5192",
"version_major": 2,
"version_minor": 0
},