Skip to content

Commit

Permalink
git subrepo pull (merge) simulink_matpower
Browse files Browse the repository at this point in the history
subrepo:
  subdir:   "simulink_matpower"
  merged:   "8631fb3"
upstream:
  origin:   "[email protected]:MATPOWER/mx-simulink_matpower.git"
  branch:   "main"
  commit:   "8631fb3"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "dbb99be"
  • Loading branch information
rdzman committed Mar 9, 2023
1 parent 3dd324c commit 2d5ec30
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
4 changes: 2 additions & 2 deletions simulink_matpower/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = [email protected]:MATPOWER/mx-simulink_matpower.git
branch = main
commit = b47a770d2946057a6346a88c30a8c919c43e4655
parent = 9d276b545a3df0290c881c37a5c830d278527b61
commit = 8631fb3b98a8867299d54f9d89551e038bfd4b88
parent = 3dd324c2df0b50ee39abe5e5a19c36a704d71c87
method = merge
cmdver = 0.4.5
13 changes: 11 additions & 2 deletions simulink_matpower/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ The idea is the following: MATPOWER provides us with a power flow
solver. Simulink provides a graphic interface. Let's bring these two
together and enable people to use MATPOWER in Simulink.

> **Note:** SimulinkMATPOWER is part of [MATPOWER Extras][8],
which is included in MATPOWER zip distributions in the
`extras/simulink_matpower` directory.

How it works
------------
Expand All @@ -32,8 +35,13 @@ blocks that get voltage magnitudes etc).
Setup
-----

1. Add toolbox to Matlab path _(INCLUDING SUBFOLDERS)_.
2. [Install MATPOWER][4].
1. [Install MATPOWER][4].
2. Add the toolbox directory **with sub-directories** to the Matlab path.

> _**Note:** Step 2 is necessary **only** if SimulinkMATPOWER
was not already included with your MATPOWER distribution (in
`extras/simulink_matpower`)._

3. Go into `ac_testbed_setup.m` and change the code in line 16 to load
the MATPOWER case file you want to work with.
4. Run `ac_testbed_setup` (in `example.slx` it is automatically run by
Expand Down Expand Up @@ -146,3 +154,4 @@ SimulinkMATPOWER is distributed under the [3-clause BSD license][7].
[5]: CITATION
[6]: https://doi.org/10.48550/arXiv.2212.07795
[7]: LICENSE
[8]: https://github.com/MATPOWER/matpower-extras

0 comments on commit 2d5ec30

Please sign in to comment.