Jd/init dev

Project.toml

@@ -1,6 +1,6 @@
 name = "LITS"
 uuid = "86b0dc02-7903-11e9-325f-f195ca7e6c1a"
-version = "0.3.1"
+version = "0.4.0"
 
 [deps]
 DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
@@ -11,11 +11,10 @@ NLsolve = "2774e3e8-f4cf-5e23-947b-6d7e65073b56"
 PowerSystems = "bcd98974-b02a-5e2f-9ee0-a103f5c450dd"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
-
 [compat]
 DiffEqBase = "6"
 ForwardDiff = "~v0.10"
-InfrastructureSystems = "~0.5"
+InfrastructureSystems = "~0.6"
 NLsolve = "4"
-PowerSystems = "~0.11"
+PowerSystems = "~0.14"
 julia = "^1.2"

dev_files/init_cond/Twogen2bus.m

@@ -15,7 +15,7 @@
 %% generator data
 %	bus	Pg	Qg	Qmax	Qmin	Vg	mBase	status	Pmax	Pmin	Pc1	Pc2	Qc1min	Qc1max	Qc2min	Qc2max	ramp_agc	ramp_10	ramp_30	ramp_q	apf
 mpc.gen = [
-	1	700	70	100	-100	1.02	1000	1000	1000	0	0	0	0	0	0	0	0	0	0	0;
+	1	700	70	100	-100	1.02	1000	1	1000	0	0	0	0	0	0	0	0	0	0	0;
 	%2	50 -30	100	-100	1.0	100	1	150	37.5	0	0	0	0	0	0	0	0	0	0	0;
 ];
 

dev_files/init_cond/initial_conditions.ipynb

@@ -2,37 +2,156 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 8,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "PowerSystems"
+      ]
+     },
+     "execution_count": 8,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
+    "using Revise\n",
     "using PowerModels\n",
     "using Ipopt\n",
     "using ForwardDiff\n",
-    "using OrdinaryDiffEq\n",
-    "using NLsolve"
+    "#using OrdinaryDiffEq\n",
+    "using NLsolve\n",
+    "using PowerSystems\n",
+    "const PSY = PowerSystems"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 9,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<style>.container { width:100% !important; }</style>"
+      ],
+      "text/plain": [
+       "HTML{String}(\"<style>.container { width:100% !important; }</style>\")"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
    "source": [
     "display(HTML(\"<style>.container { width:100% !important; }</style>\"))"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "scrolled": false
-   },
-   "outputs": [],
+   "execution_count": 21,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "┌ Info: Constructing System from Power Models\n",
+      "│   data[\"name\"] = Twogen2bus\n",
+      "│   data[\"source_type\"] = matpower\n",
+      "└ @ PowerSystems /Users/jdlara/.julia/packages/PowerSystems/wHSk9/src/parsers/power_models_data.jl:33\n",
+      "┌ Info: Reading bus data\n",
+      "└ @ PowerSystems /Users/jdlara/.julia/packages/PowerSystems/wHSk9/src/parsers/power_models_data.jl:122\n",
+      "┌ Info: Reading generator data\n",
+      "└ @ PowerSystems /Users/jdlara/.julia/packages/PowerSystems/wHSk9/src/parsers/power_models_data.jl:368\n",
+      "┌ Warning: Generator cost data not included for Generator: gen-1-1\n",
+      "└ @ PowerSystems /Users/jdlara/.julia/packages/PowerSystems/wHSk9/src/parsers/power_models_data.jl:330\n",
+      "┌ Info: Reading branch data\n",
+      "└ @ PowerSystems /Users/jdlara/.julia/packages/PowerSystems/wHSk9/src/parsers/power_models_data.jl:520\n",
+      "┌ Warning: Rate provided for 1 is 32.0, larger the SIL 258.94053053874836 in the range of (min = 325.0, max = 425.0).\n",
+      "└ @ PowerSystems /Users/jdlara/.julia/packages/PowerSystems/wHSk9/src/utils/IO/branchdata_checks.jl:150\n",
+      "┌ Info: Reading branch data\n",
+      "└ @ PowerSystems /Users/jdlara/.julia/packages/PowerSystems/wHSk9/src/parsers/power_models_data.jl:583\n",
+      "┌ Info: Reading DC Line data\n",
+      "└ @ PowerSystems /Users/jdlara/.julia/packages/PowerSystems/wHSk9/src/parsers/power_models_data.jl:554\n",
+      "┌ Info: PowerFlow solve converged, the results have been stored in the system\n",
+      "└ @ PowerSystems /Users/jdlara/.julia/packages/PowerSystems/wHSk9/src/utils/power_flow/power_flow.jl:147\n"
+     ]
+    },
+    {
+     "data": {
+      "text/plain": [
+       "true"
+      ]
+     },
+     "execution_count": 21,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "file_dir = joinpath(pwd(), \"Twogen2bus.m\")\n",
+    "sys = System(PSY.PowerModelsData(file_dir))\n",
+    "solve_powerflow!(sys, nlsolve, method = :newton)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 26,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Vm = 1.02 Va= 0.0\n",
+      "Vm = 1.0 Va= -0.1279338657728345\n"
+     ]
+    }
+   ],
+   "source": [
+    "for b in get_components(Bus, sys)\n",
+    "    println(\"Vm = $(get_voltage(b))\", \" \",\"Va= $(get_angle(b))\")\n",
+    "end"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 19,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "\u001b[1mMetadata\u001b[0m\n",
+      "  baseMVA: 1000\n",
+      "  per_unit: true\n",
+      "\n",
+      "\u001b[1mTable Counts\u001b[0m\n",
+      "  bus: 2\n",
+      "  gen: 1\n",
+      "\n",
+      "\n",
+      "\u001b[1mTable: bus\u001b[0m\n",
+      "            vm,     va\n",
+      "      1: 1.020,  0.000\n",
+      "      2: 1.000, -0.128\n",
+      "\n",
+      "\n",
+      "\u001b[1mTable: gen\u001b[0m\n",
+      "            pg,    qg\n",
+      "      1: 0.703, 0.051\n"
+     ]
+    }
+   ],
    "source": [
-    "data = PowerModels.parse_file(\"C:/Users/Ewa/Downloads/Twogen2bus.m\")\n",
-    "pf_result = run_ac_pf(data ,Ipopt.Optimizer)\n",
-    "#PowerModels.print_summary(pf_result[\"solution\"])"
+    "data = PowerModels.parse_file(file_dir)\n",
+    "opt = optimizer_with_attributes(Ipopt.Optimizer, \"print_level\" => 0)\n",
+    "pf_result = run_ac_pf(data, opt)\n",
+    "PowerModels.print_summary(pf_result[\"solution\"])"
    ]
   },
   {
@@ -301,17 +420,17 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Julia 1.3.1",
+   "display_name": "Julia 1.4.0",
    "language": "julia",
-   "name": "julia-1.3"
+   "name": "julia-1.4"
   },
   "language_info": {
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.3.1"
+   "version": "1.4.0"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }

docs/src/Examples/example_lines.md

@@ -368,8 +368,8 @@ x0_guess = [
     0.0, #V1_I
     -0.01, #V2_I
     -0.01, #V3_I
-    0.0, #δω_vsm
-    0.2, #δθ_vsm
+    0.0, #ω_oc
+    0.2, #θ_oc
     0.025, #qm
     0.0015, #ξ_d
     -0.07, #ξ_q
@@ -380,13 +380,13 @@ x0_guess = [
     1.004, #vpll_d
     0.0, #vpll_q
     0.0, #ε_pll
-    0.1, #δθ_pll
+    0.1, #θ_pll
     0.5, #id_cv
     0.0, #iq_cv
-    0.95, #vod
-    -0.1, #voq
-    0.49, #iod
-    -0.1, #ioq
+    0.95, #Vd_filter
+    -0.1, #Vq_filter
+    0.49, #Id_filter
+    -0.1, #Iq_filter
     1.0, #eq_p
     0.47, #ed_p
     0.6, #δ

src/LITS.jl

@@ -4,7 +4,7 @@ module LITS
 ####################################### Structs Exports ####################################
 
 # Base Exports
-export DynBranch
+export DynamicLine
 export Simulation
 export run_simulation!
 export ThreePhaseFault
@@ -23,10 +23,11 @@ import InfrastructureSystems
 import DiffEqBase
 import ForwardDiff
 import SparseArrays: SparseMatrixCSC
-import LinearAlgebra: BLAS
+#import LinearAlgebra: BLAS
 import LinearAlgebra: eigen
 import Base.to_index
 import NLsolve
+import Base.ImmutableDict
 import PowerSystems
 const PSY = PowerSystems
 const IS = InfrastructureSystems
@@ -41,7 +42,7 @@ include("base/simulation.jl")
 #Common Models
 include("models/branch.jl")
 include("models/device.jl")
-include("models/kcl.jl")
+include("models/kirchoff_laws.jl")
 include("models/dynline_model.jl")
 include("models/ref_transformations.jl")
 
@@ -57,7 +58,7 @@ include("models/inverter_models/DCside_models.jl")
 include("models/inverter_models/filter_models.jl")
 include("models/inverter_models/frequency_estimator_models.jl")
 include("models/inverter_models/outer_control_models.jl")
-include("models/inverter_models/voltage_source_control_models.jl")
+include("models/inverter_models/inner_control_models.jl")
 include("models/inverter_models/converter_models.jl")
 
 #Injection Models
@@ -69,6 +70,7 @@ include("models/system.jl")
 
 #Utils
 include("utils/plot_utils.jl")
+include("utils/immutable_dicts.jl")
 include("utils/print.jl")
 include("utils/kwargs_check.jl")
 

src/base/definitions.jl

@@ -40,32 +40,32 @@ Inverter Inner Vars:
 md_var :: Modulation signal on the d-component
 mq_var :: Modulation signal on the q-component
 Vdc_var :: DC voltage supplied by the DC source
-Vdo_var :: Voltage seen in the capacitor of the filter in the d-component
-Vqo_var :: Voltage seen in the capacitor of the filter in the q-component
+Vd_filter_var :: Voltage seen in the capacitor of the filter in the d-component
+Vq_filter_var :: Voltage seen in the capacitor of the filter in the q-component
 ω_freq_estimator_var :: Frequency estimated by the frequency estimator.
-v_control_var :: Control voltage supplied from the outer loop control to the inner loop
-ω_control_var :: Control frequency supplied from the outer loop control the inner loop
-δdqRI_var :: Variation of the angle (PLL or VSM) of the inverter
+V_oc_var :: Control voltage supplied from the outer loop control to the inner loop
+ω_oc_var :: Control frequency supplied from the outer loop control the inner loop
+θ_oc_var :: Variation of the angle (PLL or VSM) of the inverter
 VR_inv_var :: Real terminal voltage on the inverter
 VI_inv_var :: Imaginary terminal voltage on the inverter
-Vdcnv_var :: Voltage supplied from the converter in the d-component
-Vqcnv_var :: Voltage supplied from the converter in the q-component
+Vd_cnv_var :: Voltage supplied from the converter in the d-component
+Vq_cnv_var :: Voltage supplied from the converter in the q-component
 """
 
 @enum inverter_inner_vars begin
     md_var = 1
     mq_var = 2
     Vdc_var = 3
-    Vdo_var = 4
-    Vqo_var = 5
+    Vd_filter_var = 4
+    Vq_filter_var = 5
     ω_freq_estimator_var = 6
-    v_control_var = 7
-    ω_control_var = 8
-    δdqRI_var = 9
+    V_oc_var = 7
+    ω_oc_var = 8
+    θ_oc_var = 9
     VR_inv_var = 10
     VI_inv_var = 11
-    Vdcnv_var = 12
-    Vqcnv_var = 13
+    Vd_cnv_var = 12
+    Vq_cnv_var = 13
 end
 
 Base.to_index(ix::inverter_inner_vars) = Int(ix)
@@ -84,5 +84,8 @@ const INNER_VARS = "inner_vars"
 const YBUS = "Ybus"
 const CONTROL_REFS = "control_refs"
 const GLOBAL_VARS = "global_vars"
+const VOLTAGE_BUSES_NO = "voltage_buses_no"
+const CURRENT_BUSES_NO = "current_buses_no"
+const TOTAL_SHUNTS = "total_shunts"
 
 const SIMULATION_ACCEPTED_KWARGS = [:initial_guess, :initialize_simulation]