renamed Francis Turbine class to just Turbine class

This commit is contained in:
Brantegger Georg
2023-02-09 15:51:34 +01:00
parent 3a22decfb4
commit 1385aaecbe
5 changed files with 178 additions and 184 deletions

View File

@@ -11,7 +11,6 @@ current = os.path.dirname(os.path.realpath(__file__))
parent = os.path.dirname(current)
sys.path.append(parent)
from functions.pressure_conversion import pressure_conversion
from Turbinen.Turbinen_class_file import Francis_Turbine
class Kraftwerk_class:

View File

@@ -18,7 +18,7 @@
"from functions.pressure_conversion import pressure_conversion\n",
"from Ausgleichsbecken.Ausgleichsbecken_class_file import Ausgleichsbecken_class\n",
"from Druckrohrleitung.Druckrohrleitung_class_file import Druckrohrleitung_class\n",
"from Turbinen.Turbinen_class_file import Francis_Turbine\n",
"from Turbinen.Turbinen_class_file import Turbine\n",
"from Regler.Regler_class_file import PI_controller_class"
]
},
@@ -110,8 +110,8 @@
"pipe.set_steady_state(flux_init,reservoir.get_current_pressure())\n",
"\n",
"# influx setting turbines\n",
"OL_T1 = Francis_Turbine(OL_T1_Q_nenn,OL_T1_p_nenn,OL_T1_closingTime,Pip_dt,pUnit_conv)\n",
"OL_T2 = Francis_Turbine(OL_T2_Q_nenn,OL_T2_p_nenn,OL_T2_closingTime,Pip_dt,pUnit_conv)\n",
"OL_T1 = Turbine(OL_T1_Q_nenn,OL_T1_p_nenn,OL_T1_closingTime,Pip_dt,pUnit_conv)\n",
"OL_T2 = Turbine(OL_T2_Q_nenn,OL_T2_p_nenn,OL_T2_closingTime,Pip_dt,pUnit_conv)\n",
"\n",
"KW_OL = Kraftwerk_class()\n",
"KW_OL.add_turbine(OL_T1)\n",
@@ -120,8 +120,8 @@
"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",
"UL_T2 = Francis_Turbine(UL_T2_Q_nenn,UL_T2_p_nenn,UL_T2_closingTime,Pip_dt,pUnit_conv)\n",
"UL_T1 = Turbine(UL_T1_Q_nenn,UL_T1_p_nenn,UL_T1_closingTime,Pip_dt,pUnit_conv)\n",
"UL_T2 = Turbine(UL_T2_Q_nenn,UL_T2_p_nenn,UL_T2_closingTime,Pip_dt,pUnit_conv)\n",
"\n",
"KW_UL = Kraftwerk_class()\n",
"KW_UL.add_turbine(UL_T1)\n",
@@ -380,13 +380,6 @@
"fig3.tight_layout()\n",
"plt.show()"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {