Commit Graph

64 Commits

Author SHA1 Message Date
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
69b8beacb5 added outflux velocity to the ausgleichsbecken
class
2022-07-12 08:48:00 +02:00
Georg ´Brantegger
1af878b756 added outlfux velocity attribute to the
ausgleichsbecken class
2022-07-12 08:43:42 +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
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
Brantegger Georg
b03bb43c63 probably working combined code :D 2022-07-05 16:02:55 +02:00
Brantegger Georg
7506da8b2e adapted Druckrohrleitungscode to include pipeline
incline - not sure if code reproduces physical behavior because initial
pressure seems to disipate way too quickly
2022-07-05 09:30:27 +02:00
Georg ´Brantegger
28d38e8bb4 consolidated the getter methods of the classes 2022-07-01 11:28:21 +02:00
Georg ´Brantegger
b948ab39cb further clean-up and added pressure-
conversion import from single-source
2022-07-01 09:20:19 +02:00
Georg ´Brantegger
ba48bbe057 still cleaning up folder structures 2022-07-01 09:01:56 +02:00
Georg ´Brantegger
59998a707c still cleaning up 2022-07-01 09:00:58 +02:00
Georg ´Brantegger
f774b2e52d Clean up before combining pipeline and
reservoir code
2022-07-01 08:58:29 +02:00
Brantegger Georg
d7585c3664 end of day 29.06.2022 2022-06-29 15:51:49 +02:00
Brantegger Georg
8cfd14838c added Druckrohrleitungs class, based on ETH Code 2022-06-29 13:51:53 +02:00
Brantegger Georg
57cb951f5b well, I forgot to save the last changes :D 2022-06-28 15:39:19 +02:00
Brantegger Georg
a109b8d8d1 small formatations 2022-06-28 15:37:54 +02:00
Brantegger Georg
fe6b7c0e6b Found the reason why pressure_surge didn't work
as expected -> unintentional overwrite memory address
2022-06-28 14:58:22 +02:00
Brantegger Georg
16bc55d47a end of day commit 27.06.2022 2022-06-27 16:16:24 +02:00
Georg ´Brantegger
b6c01bfce2 Merge branch 'Dev' of https://github.com/GeorgBrantegger/Kelag_DT_Slot_3 into Dev 2022-06-23 09:20:37 +02:00
Brantegger Georg
4e862895f5 end of day commit 2022-06-22 15:45:31 +02:00
Brantegger Georg
4510aeaaf8 ETH vorläufiges Druckstoßskript eingearbeitet 2022-06-21 15:35:37 +02:00
Brantegger Georg
0567f40fd5 adapted the ausgleichsbecken class to be able to
work well with changing pipeline pressures
and changed the main program accordingly
2022-06-21 09:35:26 +02:00
Brantegger Georg
18fd4cd935 forgot to move 2 files :D 2022-06-21 07:08:33 +02:00
Brantegger Georg
5cdf62073d folder restructuring on Dev branch 2022-06-21 07:03:19 +02:00
Brantegger Georg
50fb2d4a04 Preparation for non static pipeline pressure 2022-06-20 14:28:49 +02:00
Brantegger Georg
a3ce2e450e Merge branch 'Dev' 2022-06-20 12:56:51 +02:00
Brantegger Georg
8b86f120ed pre-merge-commit 2022-06-20 12:55:13 +02:00
Brantegger Georg
4583d59f0f kinda working version of Ausgleichbecken code
for static pipeline pressure
2022-06-20 11:55:32 +02:00
Brantegger Georg
f89ff4c1dc incorporated the pressure conversion so that the
FODE function always gets pressure in Pa
2022-06-20 11:34:32 +02:00
Brantegger Georg
981b099673 updated the units section, to display latex style text 2022-06-20 11:23:05 +02:00
Brantegger Georg
1578080072 created a function, that converts pressures 2022-06-20 11:22:26 +02:00
Brantegger Georg
312f6b9532 adapted FODE function in e-RK4 to (propably) be
able to handle negative outflux velocities
-> influx from pipeline
2022-06-20 09:23:59 +02:00
Georg ´Brantegger
6df9bfcda6 commit for sync 15.06. 2022-06-15 14:59:48 +02:00
Georg ´Brantegger
5bb223fedb looks like e-RK4 is working :D 2022-06-15 10:15:18 +02:00
Brantegger Georg
115e59af3b build a programm to test e-RK4-function - NOT WORKING YET 2022-06-14 14:25:51 +02:00
Brantegger Georg
d73bc99f49 now actually added unapplicable Hagen Poiseuille 2022-06-13 15:04:56 +02:00
Brantegger Georg
aa2939bf8b started work on e-RK-4 for outflux calculation 2022-06-13 15:03:01 +02:00
Brantegger Georg
12b362523e added unapplicable hagen Poiseuille 2022-06-13 15:02:34 +02:00
Brantegger Georg
f673eb3870 Merge branch 'Dev' of https://github.com/GeorgBrantegger/Kelag_DT_Slot_3 into Dev 2022-06-13 07:18:44 +02:00
Georg ´Brantegger
3024d83042 simple time delay function added 2022-06-09 15:01:25 +02:00
Georg ´Brantegger
d4600b5926 Volume and height changes dependend on flux profiles 2022-06-09 15:00:40 +02:00
Georg ´Brantegger
e7355cdbe3 moved gitignore to the right place again 2022-06-09 13:11:14 +02:00