Brantegger Georg
48ec79d0c3
Merge branch 'Dev'
2022-08-09 13:59:08 +02:00
Brantegger Georg
003d564795
added Kraftwerk_class to combine multiple turbines
2022-08-09 13:54:33 +02:00
Brantegger Georg
43483dc959
small change to the convergence and set steady state method
2022-08-09 13:53:09 +02:00
Brantegger Georg
7394d6c964
added "vectorized" version of method of characteristics
2022-08-09 13:51:57 +02:00
Brantegger Georg
cfb8652ac2
Merge branch 'Dev'
2022-08-08 14:51:49 +02:00
Brantegger Georg
38c809ef49
small changes for consistency, comments and a small fix in the convergence method of the turbine
2022-08-08 14:49:22 +02:00
Brantegger Georg
112c9d427a
Merge branch 'Dev'
2022-08-08 07:53:06 +02:00
Brantegger Georg
5a790d5ca5
probably working version (with unrealistic controller design)
2022-08-08 07:46:35 +02:00
Brantegger Georg
ba696444bb
fix for numerical runaway of rounding errors
...
due to turbine-pipeline interatction
via a convergence method in the turbine
and a "damping" trick on the reservoir velocity
plus: code cleanup with consistent naming of variables
2022-08-03 15:56:56 +02:00
Brantegger Georg
1aee8debc4
for pictures
2022-08-02 11:31:26 +02:00
Brantegger Georg
84631ee4cc
first try at fixing convergence issues at turbine
2022-08-02 07:47:10 +02:00
Brantegger Georg
1fa71d4939
cleanup old files
2022-08-01 09:03:12 +02:00
Brantegger Georg
3633a7b4ba
Merge branch 'Dev'
2022-08-01 09:01:24 +02:00
Brantegger Georg
ed710a7371
pre-merge commit
...
working steady state, but still numerical instability at turbine, that leads to runaway after approx 2.5 minutes for 1000 m pipeline
2022-08-01 08:58:11 +02:00
Georg ´Brantegger
0969c29b7d
missed stageing
2022-07-29 08:25:38 +02:00
Georg ´Brantegger
b4bfd017de
added safety condition on turbine flux and turbine LA
2022-07-29 08:25:23 +02:00
Georg ´Brantegger
dc5bcfe7f8
fixed a coding mistake that lead to
...
a missbehavior in the time evolution of the
reservoir
2022-07-28 16:26:04 +02:00
Georg ´Brantegger
e90406d90b
corrected the steady state method to work properly
2022-07-28 12:23:45 +02:00
Georg ´Brantegger
9df448663e
corrected steady state pressure to work properly
2022-07-28 11:36:39 +02:00
Brantegger Georg
03ff67e0ad
working on a fix for steady state Ausgleichsbecken
2022-07-27 16:02:39 +02:00
Brantegger Georg
176fa556ff
added dynamic pressure effect to the FODE function
2022-07-27 15:11:31 +02:00
Brantegger Georg
d1c15090dc
code cleanup:
...
consistenly use getter and setter methods
commenting etc
2022-07-27 11:40:58 +02:00
Brantegger Georg
ac8bfdb7c6
further code cleanup
2022-07-25 15:59:46 +02:00
Brantegger Georg
0de946f8ac
code cleanup and commenting I
2022-07-25 11:51:02 +02:00
Brantegger Georg
9c70ce3d8d
Merge branch 'Dev'
2022-07-25 10:28:37 +02:00
Brantegger Georg
9204729d0b
pre-merge commit
2022-07-25 10:25:06 +02:00
Brantegger Georg
11cfda4615
added PI controller test
2022-07-25 10:22:22 +02:00
Georg ´Brantegger
5835c05af9
first attempt at involving a Pegelregler in the system
2022-07-21 15:27:36 +02:00
Georg ´Brantegger
2331c7cc5b
added set steady state functionality
2022-07-21 15:27:15 +02:00
Brantegger Georg
d966904606
added first try for turbine flux based on pressure and
...
LA opening
2022-07-20 15:43:51 +02:00
Brantegger Georg
7e67979a82
end of day commit - working on turbine class
2022-07-19 15:51:57 +02:00
GeorgBrantegger
5654a41d48
Add files via upload
2022-07-19 13:54:25 +02:00
Brantegger Georg
08edd2f85c
end of day commit - work on PI controller
2022-07-18 15:16:16 +02:00
Brantegger Georg
5c25e81f37
updated to use outflux_vel instead of outflux
2022-07-18 08:15:11 +02:00
Brantegger Georg
6d56e3d1f2
updated test programm for the Ausgleichsbecken
...
class to reflect the use Pa as pressure unit within the class
2022-07-18 08:00:29 +02:00
Georg ´Brantegger
04819d2e68
started implementing turbine and controller code
2022-07-15 12:01:22 +02:00
Georg ´Brantegger
84ccadc66d
end of day commit 12.07.
2022-07-12 14:07:53 +02:00
Georg ´Brantegger
69b8beacb5
added outflux velocity to the ausgleichsbecken
...
class
2022-07-12 08:48:00 +02:00
Georg ´Brantegger
824034699e
Merge branch 'Dev'
2022-07-12 08:44:02 +02:00
Georg ´Brantegger
1af878b756
added outlfux velocity attribute to the
...
ausgleichsbecken class
2022-07-12 08:43:42 +02:00
Georg ´Brantegger
c01b03f766
Merge branch 'Dev'
2022-07-12 06:57:54 +02:00
Brantegger Georg
b1696f696c
small formatting and labeling changes
2022-07-07 14:33:16 +02:00
Brantegger Georg
c854fe7da8
folder cleanup
2022-07-06 12:24:14 +02:00
GeorgBrantegger
cd38c541af
Delete Messing Around directory
2022-07-06 12:22:09 +02:00
GeorgBrantegger
05715e760a
Delete .vscode directory
2022-07-06 12:21:57 +02:00
GeorgBrantegger
f55c2b6da2
Delete __pycache__ directory
2022-07-06 12:21:46 +02:00
Brantegger Georg
eb267866cf
ready for main merge
2022-07-06 11:08:21 +02:00
Brantegger Georg
cdc7e3546d
(forgot to stage changes in the Druckrohrleitung
...
class
2022-07-06 11:07:53 +02:00
Brantegger Georg
be8b5e29b2
made sure pressures are consistent in Pa in all
...
classes
2022-07-06 11:06:56 +02:00
Brantegger Georg
c81c0ab142
code cleanup and commentary
2022-07-06 10:29:22 +02:00
