From df0fb4f0ed2e9439be6144c6b721d0ef08aa6fd8 Mon Sep 17 00:00:00 2001 From: Brantegger Georg Date: Thu, 9 Feb 2023 13:11:02 +0100 Subject: [PATCH] small changes --- .../Ausgleichsbecken_test_steady_state.ipynb | 2 +- .../Druckrohrleitung_test_steady_state.ipynb | 2 +- .../Druckstoß Visualisierung.ipynb | 20 ++++++++--------- KW Vorlage.ipynb | 10 +++++++++ Kraftwerk/Kraftwerk_test_steady_state.ipynb | 22 +++++++++---------- Turbinen/Turbinen_class_file.py | 2 +- Turbinen/Turbinen_test_steady_state.ipynb | 22 ++++++++++++------- 7 files changed, 48 insertions(+), 32 deletions(-) diff --git a/Ausgleichsbecken/Ausgleichsbecken_test_steady_state.ipynb b/Ausgleichsbecken/Ausgleichsbecken_test_steady_state.ipynb index 449ab39..76158d3 100644 --- a/Ausgleichsbecken/Ausgleichsbecken_test_steady_state.ipynb +++ b/Ausgleichsbecken/Ausgleichsbecken_test_steady_state.ipynb @@ -189,7 +189,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "3987c69b8123480db34b021e1a5393a0", + "model_id": "edc00116bee443f0975cd1fb20cf8179", "version_major": 2, "version_minor": 0 }, diff --git a/Druckrohrleitung/Druckrohrleitung_test_steady_state.ipynb b/Druckrohrleitung/Druckrohrleitung_test_steady_state.ipynb index dd4c313..084444c 100644 --- a/Druckrohrleitung/Druckrohrleitung_test_steady_state.ipynb +++ b/Druckrohrleitung/Druckrohrleitung_test_steady_state.ipynb @@ -209,7 +209,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 7, "metadata": {}, "outputs": [], "source": [ diff --git a/Druckrohrleitung/Druckstoß Visualisierung.ipynb b/Druckrohrleitung/Druckstoß Visualisierung.ipynb index 9421864..880f491 100644 --- a/Druckrohrleitung/Druckstoß Visualisierung.ipynb +++ b/Druckrohrleitung/Druckstoß Visualisierung.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 9, + "execution_count": 1, "metadata": {}, "outputs": [], "source": [ @@ -22,7 +22,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 2, "metadata": {}, "outputs": [], "source": [ @@ -77,7 +77,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 3, "metadata": {}, "outputs": [ { @@ -94,7 +94,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 4, "metadata": {}, "outputs": [], "source": [ @@ -111,7 +111,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 5, "metadata": {}, "outputs": [], "source": [ @@ -156,7 +156,7 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 6, "metadata": {}, "outputs": [], "source": [ @@ -195,7 +195,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 7, "metadata": {}, "outputs": [], "source": [ @@ -264,7 +264,7 @@ }, { "cell_type": "code", - "execution_count": 16, + "execution_count": 8, "metadata": {}, "outputs": [], "source": [ @@ -300,7 +300,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3.8.13 ('DT_Slot_3')", + "display_name": "Python 3.8.13 ('Georg_DT_Slot3')", "language": "python", "name": "python3" }, @@ -319,7 +319,7 @@ "orig_nbformat": 4, "vscode": { "interpreter": { - "hash": "4a28055eb8a3160fa4c7e4fca69770c4e0a1add985300856aa3fcf4ce32a2c48" + "hash": "84fb123bdc47ab647d3782661abcbe80fbb79236dd2f8adf4cef30e8755eb2cd" } } }, diff --git a/KW Vorlage.ipynb b/KW Vorlage.ipynb index 594c42a..17bd218 100644 --- a/KW Vorlage.ipynb +++ b/KW Vorlage.ipynb @@ -1,5 +1,15 @@ { "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "to dos:\n", + "Francis Turbine in Turbine umbennenen\n", + "Fall für andere Anzahl an Turbinen in Dokumentation aufnehmen\n", + "DevBranch wegwerfen" + ] + }, { "attachments": {}, "cell_type": "markdown", diff --git a/Kraftwerk/Kraftwerk_test_steady_state.ipynb b/Kraftwerk/Kraftwerk_test_steady_state.ipynb index 24221ab..3f4bf1a 100644 --- a/Kraftwerk/Kraftwerk_test_steady_state.ipynb +++ b/Kraftwerk/Kraftwerk_test_steady_state.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 1, + "execution_count": null, "metadata": {}, "outputs": [], "source": [ @@ -24,7 +24,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": null, "metadata": {}, "outputs": [], "source": [ @@ -95,7 +95,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": null, "metadata": {}, "outputs": [], "source": [ @@ -117,7 +117,7 @@ "KW_OL.add_turbine(OL_T1)\n", "KW_OL.add_turbine(OL_T2)\n", "\n", - "KW_OL.set_steady_state(flux_init,OL_T1_p_nenn)\n", + "KW_OL.set_steady_state_by_flux(flux_init,OL_T1_p_nenn)\n", "\n", "# downstream turbines\n", "UL_T1 = Francis_Turbine(UL_T1_Q_nenn,UL_T1_p_nenn,UL_T1_closingTime,Pip_dt,pUnit_conv)\n", @@ -127,7 +127,7 @@ "KW_UL.add_turbine(UL_T1)\n", "KW_UL.add_turbine(UL_T2)\n", "\n", - "KW_UL.set_steady_state(flux_init,pipe.get_current_pressure_distribution()[-1])\n", + "KW_UL.set_steady_state_by_flux(flux_init,pipe.get_current_pressure_distribution()[-1])\n", "\n", "# level controller\n", "level_control = PI_controller_class(Con_targetLevel,Con_deadbandRange,Con_K_p,Con_T_i,Pip_dt)\n", @@ -136,7 +136,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": null, "metadata": {}, "outputs": [], "source": [ @@ -208,7 +208,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": null, "metadata": {}, "outputs": [], "source": [ @@ -241,11 +241,11 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": null, "metadata": {}, "outputs": [], "source": [ - "convergence_parameters = [p_old[-2],v_old[-2],Pip_dia,Pip_area,Pip_angle,Pip_f_D,Pip_pw_vel,rho,Pip_dt]\n", + "convergence_parameters = [p_old[-2],v_old[-2],Pip_dia,Pip_area,Pip_angle,Pip_f_D,Pip_pw_vel,rho,Pip_dt,p_old[-1]]\n", "\n", "# loop through Con_T_ime steps of the pipeline\n", "for it_pipe in range(1,nt+1):\n", @@ -323,7 +323,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": null, "metadata": {}, "outputs": [], "source": [ @@ -389,7 +389,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": null, "metadata": {}, "outputs": [], "source": [ diff --git a/Turbinen/Turbinen_class_file.py b/Turbinen/Turbinen_class_file.py index 2958db2..efc45b6 100644 --- a/Turbinen/Turbinen_class_file.py +++ b/Turbinen/Turbinen_class_file.py @@ -90,7 +90,7 @@ class Francis_Turbine: self.set_pressure(ss_pressure) self.get_current_Q() -#getter - get attributes +# getter - get attributes def get_current_Q(self): # return the flux through the turbine, based on the current pressure in front # of the turbine and the Leitapparatöffnung diff --git a/Turbinen/Turbinen_test_steady_state.ipynb b/Turbinen/Turbinen_test_steady_state.ipynb index cf2d478..ebc22e4 100644 --- a/Turbinen/Turbinen_test_steady_state.ipynb +++ b/Turbinen/Turbinen_test_steady_state.ipynb @@ -81,7 +81,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 6, "metadata": {}, "outputs": [], "source": [ @@ -97,11 +97,11 @@ "\n", "# downstream turbine\n", "turbine = Francis_Turbine(Tur_Q_nenn,Tur_p_nenn,Tur_closingTime,Pip_dt,pUnit_conv)\n", - "turbine.set_steady_state(flux_init,pipe.get_current_pressure_distribution()[-1])\n", + "turbine.set_steady_state_by_flux(flux_init,pipe.get_current_pressure_distribution()[-1])\n", "\n", "# influx setting turbine\n", "turbine_in = Francis_Turbine(Tur_Q_nenn,Tur_p_nenn,Tur_closingTime/2,Pip_dt,pUnit_conv)\n", - "turbine_in.set_steady_state(flux_init,Tur_p_nenn)\n", + "turbine_in.set_steady_state_by_flux(flux_init,Tur_p_nenn)\n", "\n", "# level controll\n", "level_control = PI_controller_class(Con_targetLevel,Con_deadbandRange,Con_K_p,Con_T_i,Pip_dt)\n", @@ -110,7 +110,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 7, "metadata": {}, "outputs": [], "source": [ @@ -155,7 +155,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 8, "metadata": {}, "outputs": [], "source": [ @@ -188,7 +188,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 9, "metadata": {}, "outputs": [], "source": [ @@ -232,7 +232,6 @@ "\n", " # the the boundary condition in the pipe.object and thereby calculate boundary pressure at turbine\n", " pipe.set_boundary_conditions_next_timestep(p_boundary_res[it_pipe],v_boundary_tur[it_pipe])\n", - " # pipe.v[0] = (0.8*pipe.v[0]+0.2*reservoir.get_current_outflux()/Res_area_out) # unnecessary\n", " p_boundary_tur[it_pipe] = pipe.get_current_pressure_distribution()[-1]\n", " v_boundary_res[it_pipe] = pipe.get_current_velocity_distribution()[0]\n", " Q_boundary_res[it_pipe] = pipe.get_current_flux_distribution()[0]\n", @@ -270,7 +269,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 10, "metadata": {}, "outputs": [], "source": [ @@ -329,6 +328,13 @@ "fig2.tight_layout()\n", "plt.show()" ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": {