Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dc bus mod #135

Closed
wants to merge 47 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
4096ddc
added initial grid directories
maattaj11 Jun 7, 2024
3d0da54
grid/utils/ initializing, plots still have Bunch
MiSaren Jun 7, 2024
67f7e3c
grid/utils init & helpers done
MiSaren Jun 7, 2024
b6e33fd
add gfl models from gritulator
maattaj11 Jun 7, 2024
c297ceb
Merge branch 'add-gfl' into grid-addons
maattaj11 Jun 7, 2024
6722136
Merge pull request #1 from MiSaren/grid-addons
maattaj11 Jun 7, 2024
82c669a
Merge pull request #2 from MiSaren/add-gfl
MiSaren Jun 7, 2024
68e7219
Merge branch 'Aalto-Electric-Drives:main' into main
MiSaren Jun 10, 2024
d99e681
added grid/control/_common.py
maattaj11 Jun 10, 2024
6728bbd
Merge pull request #3 from MiSaren/model-classes
maattaj11 Jun 10, 2024
81afd2e
added missing _common.py
maattaj11 Jun 10, 2024
71969c6
Merge pull request #4 from MiSaren/model-classes
maattaj11 Jun 10, 2024
7cf7b6f
Changed Bunch datatypes to SimpleNamespace
MiSaren Jun 10, 2024
e79a34a
Merge pull request #5 from MiSaren/Bnch2SNS
MiSaren Jun 10, 2024
28d421a
changed imports for gfl example
maattaj11 Jun 10, 2024
e087972
Merge pull request #6 from MiSaren/model-classes
maattaj11 Jun 10, 2024
71fe2bf
changed L-filter model to use Subsystem base class
maattaj11 Jun 10, 2024
932b9fd
added missing property attribute
maattaj11 Jun 10, 2024
9a85b2e
Merge pull request #7 from MiSaren/add-lfilter
maattaj11 Jun 10, 2024
9c486c7
stiff source might work
MiSaren Jun 10, 2024
ef56a2f
Merge pull request #8 from MiSaren/grid_volt_source
MiSaren Jun 10, 2024
06a0e39
Changed StiffSourceAndLFilterModel to use Model base class
maattaj11 Jun 10, 2024
bd789bd
Merge pull request #9 from MiSaren/grid-model
maattaj11 Jun 10, 2024
8d67072
fixing stuff here and there
MiSaren Jun 10, 2024
f380678
Merge branch 'main' into GFL_plot_fixing
MiSaren Jun 10, 2024
bd23165
Merge pull request #10 from MiSaren/GFL_plot_fixing
MiSaren Jun 10, 2024
866b6b0
edit grid voltage source
maattaj11 Jun 10, 2024
89d8b77
Merge pull request #11 from MiSaren/gfl_example
maattaj11 Jun 10, 2024
e08f0da
initial adding of GridConverterCtrl base class
maattaj11 Jun 11, 2024
5822cc0
Merge pull request #12 from MiSaren/update-ctrl
maattaj11 Jun 11, 2024
794c12f
changed to use GFL control from gritulator side, fixes to L-filter PC…
maattaj11 Jun 11, 2024
a959278
data structure changes in GFL control
maattaj11 Jun 12, 2024
e394720
Merge pull request #13 from MiSaren/grid-models
maattaj11 Jun 12, 2024
84fe7b8
copied dc_model folder from gritulator and modified init & dc_bus.py
MiSaren Jun 12, 2024
f2ce530
dc_bus propably ready
MiSaren Jun 12, 2024
dfbccfa
Merge branch 'main' into main2
MiSaren Jun 13, 2024
cd0ee56
Merge pull request #15 from MiSaren/main2
MiSaren Jun 13, 2024
4599ef3
gfl example able to simulate, grid voltage still not saved
maattaj11 Jun 13, 2024
4855bd4
grid_volt_source, trying to set theta as state variable
MiSaren Jun 17, 2024
c5bd1d9
grid voltage angle as state variable, pcc voltage calculation
maattaj11 Jun 17, 2024
c8f988c
Merge pull request #16 from MiSaren/grid-voltage
maattaj11 Jun 17, 2024
d627756
changed grid angle to use exponential form, working grid plots
maattaj11 Jun 17, 2024
c17181c
Merge pull request #17 from MiSaren/grid-plots
maattaj11 Jun 17, 2024
81559c3
Merge pull request #18 from MiSaren/dc_bus_model
maattaj11 Jun 17, 2024
8111f0d
added post process to dc_bus
MiSaren Jun 18, 2024
b1ef1b6
adding set inputs function
MiSaren Jun 18, 2024
9a1b1bb
added placeholder for the PWM parameter in example
MiSaren Jun 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added post process to dc_bus
  • Loading branch information
MiSaren committed Jun 18, 2024
commit 8111f0d43a380dd0f6d3aa9796cfd7db03078bd6
2 changes: 1 addition & 1 deletion motulator/common/control/_control.py
Original file line number Diff line number Diff line change
@@ -381,7 +381,7 @@ def update(self, T_s, u, w):


# %%
class ComplexFFPICtrl:
class ComplexFFPIController:
"""
2DOF Synchronous-frame complex-vector PI controller with feedforward.

6 changes: 6 additions & 0 deletions motulator/grid/model/dc_bus/_dc_bus.py
Original file line number Diff line number Diff line change
@@ -103,3 +103,9 @@ def meas_dc_voltage(self):

"""
return self.state.u_dc

def post_process_states(self):
"""Post-process the solution."""
data, par = self.data, self.par
data.u_dc = self.state.u_dc
data.i_dc = par.i_ext(self.data.t) - par.G_dc*self.data.u_dc