replaced Francis_Turbine by Turbine following
rename in last commit
This commit is contained in:
@@ -13,7 +13,7 @@ from Druckrohrleitung.Druckrohrleitung_class_file import Druckrohrleitung_class
|
|||||||
from functions.pressure_conversion import pressure_conversion
|
from functions.pressure_conversion import pressure_conversion
|
||||||
from Kraftwerk.Kraftwerk_class_file import Kraftwerk_class
|
from Kraftwerk.Kraftwerk_class_file import Kraftwerk_class
|
||||||
from Regler.Regler_class_file import PI_controller_class
|
from Regler.Regler_class_file import PI_controller_class
|
||||||
from Turbinen.Turbinen_class_file import Francis_Turbine
|
from Turbinen.Turbinen_class_file import Turbine
|
||||||
|
|
||||||
Area_list = np.round(np.arange(40.,90.,5.),1)
|
Area_list = np.round(np.arange(40.,90.,5.),1)
|
||||||
Kp_list = np.round(np.arange(0.1,3.0,0.2),1)
|
Kp_list = np.round(np.arange(0.1,3.0,0.2),1)
|
||||||
@@ -113,8 +113,8 @@ for i in range(np.size(Area_list)):
|
|||||||
# create objects
|
# create objects
|
||||||
|
|
||||||
# influx setting turbines
|
# influx setting turbines
|
||||||
OL_T1 = Francis_Turbine(OL_T1_Q_nenn,OL_T1_p_nenn,OL_T1_closingTime,Pip_dt,pUnit_conv)
|
OL_T1 = Turbine(OL_T1_Q_nenn,OL_T1_p_nenn,OL_T1_closingTime,Pip_dt,pUnit_conv)
|
||||||
OL_T2 = Francis_Turbine(OL_T2_Q_nenn,OL_T2_p_nenn,OL_T2_closingTime,Pip_dt,pUnit_conv)
|
OL_T2 = Turbine(OL_T2_Q_nenn,OL_T2_p_nenn,OL_T2_closingTime,Pip_dt,pUnit_conv)
|
||||||
|
|
||||||
KW_OL = Kraftwerk_class()
|
KW_OL = Kraftwerk_class()
|
||||||
KW_OL.add_turbine(OL_T1)
|
KW_OL.add_turbine(OL_T1)
|
||||||
@@ -133,8 +133,8 @@ for i in range(np.size(Area_list)):
|
|||||||
pipe.set_steady_state(flux_init,reservoir.get_current_pressure())
|
pipe.set_steady_state(flux_init,reservoir.get_current_pressure())
|
||||||
|
|
||||||
# downstream turbines
|
# downstream turbines
|
||||||
UL_T1 = Francis_Turbine(UL_T1_Q_nenn,UL_T1_p_nenn,UL_T1_closingTime,Pip_dt,pUnit_conv)
|
UL_T1 = Turbine(UL_T1_Q_nenn,UL_T1_p_nenn,UL_T1_closingTime,Pip_dt,pUnit_conv)
|
||||||
UL_T2 = Francis_Turbine(UL_T2_Q_nenn,UL_T2_p_nenn,UL_T2_closingTime,Pip_dt,pUnit_conv)
|
UL_T2 = Turbine(UL_T2_Q_nenn,UL_T2_p_nenn,UL_T2_closingTime,Pip_dt,pUnit_conv)
|
||||||
|
|
||||||
KW_UL = Kraftwerk_class()
|
KW_UL = Kraftwerk_class()
|
||||||
KW_UL.add_turbine(UL_T1)
|
KW_UL.add_turbine(UL_T1)
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
"from functions.pressure_conversion import pressure_conversion\n",
|
"from functions.pressure_conversion import pressure_conversion\n",
|
||||||
"from Kraftwerk.Kraftwerk_class_file import Kraftwerk_class\n",
|
"from Kraftwerk.Kraftwerk_class_file import Kraftwerk_class\n",
|
||||||
"from Regler.Regler_class_file import PI_controller_class\n",
|
"from Regler.Regler_class_file import PI_controller_class\n",
|
||||||
"from Turbinen.Turbinen_class_file import Francis_Turbine"
|
"from Turbinen.Turbinen_class_file import Turbine"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -167,7 +167,7 @@
|
|||||||
"# create objects\n",
|
"# create objects\n",
|
||||||
"\n",
|
"\n",
|
||||||
"# influx setting turbines\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_T1 = Turbine(OL_T1_Q_nenn,OL_T1_p_nenn,OL_T1_closingTime,Pip_dt,pUnit_conv)\n",
|
||||||
"\n",
|
"\n",
|
||||||
"KW_OL = Kraftwerk_class()\n",
|
"KW_OL = Kraftwerk_class()\n",
|
||||||
"KW_OL.add_turbine(OL_T1)\n",
|
"KW_OL.add_turbine(OL_T1)\n",
|
||||||
@@ -186,7 +186,7 @@
|
|||||||
"pipe.set_steady_state(flux_init,reservoir.get_current_pressure())\n",
|
"pipe.set_steady_state(flux_init,reservoir.get_current_pressure())\n",
|
||||||
"\n",
|
"\n",
|
||||||
"# downstream turbines\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_T1 = Turbine(UL_T1_Q_nenn,UL_T1_p_nenn,UL_T1_closingTime,Pip_dt,pUnit_conv)\n",
|
||||||
"\n",
|
"\n",
|
||||||
"KW_UL = Kraftwerk_class()\n",
|
"KW_UL = Kraftwerk_class()\n",
|
||||||
"KW_UL.add_turbine(UL_T1)\n",
|
"KW_UL.add_turbine(UL_T1)\n",
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ from Druckrohrleitung.Druckrohrleitung_class_file import Druckrohrleitung_class
|
|||||||
from functions.pressure_conversion import pressure_conversion
|
from functions.pressure_conversion import pressure_conversion
|
||||||
from Kraftwerk.Kraftwerk_class_file import Kraftwerk_class
|
from Kraftwerk.Kraftwerk_class_file import Kraftwerk_class
|
||||||
from Regler.Regler_class_file import PI_controller_class
|
from Regler.Regler_class_file import PI_controller_class
|
||||||
from Turbinen.Turbinen_class_file import Francis_Turbine
|
from Turbinen.Turbinen_class_file import Turbine
|
||||||
|
|
||||||
# code cell 1
|
# code cell 1
|
||||||
# for loop creation
|
# for loop creation
|
||||||
@@ -120,7 +120,7 @@ for i in range(np.size(Area_list)):
|
|||||||
# create objects
|
# create objects
|
||||||
|
|
||||||
# influx setting turbines
|
# influx setting turbines
|
||||||
OL_T1 = Francis_Turbine(OL_T1_Q_nenn,OL_T1_p_nenn,OL_T1_closingTime,Pip_dt,pUnit_conv)
|
OL_T1 = Turbine(OL_T1_Q_nenn,OL_T1_p_nenn,OL_T1_closingTime,Pip_dt,pUnit_conv)
|
||||||
|
|
||||||
KW_OL = Kraftwerk_class()
|
KW_OL = Kraftwerk_class()
|
||||||
KW_OL.add_turbine(OL_T1)
|
KW_OL.add_turbine(OL_T1)
|
||||||
@@ -139,7 +139,7 @@ for i in range(np.size(Area_list)):
|
|||||||
pipe.set_steady_state(flux_init,reservoir.get_current_pressure())
|
pipe.set_steady_state(flux_init,reservoir.get_current_pressure())
|
||||||
|
|
||||||
# downstream turbines
|
# downstream turbines
|
||||||
UL_T1 = Francis_Turbine(UL_T1_Q_nenn,UL_T1_p_nenn,UL_T1_closingTime,Pip_dt,pUnit_conv)
|
UL_T1 = Turbine(UL_T1_Q_nenn,UL_T1_p_nenn,UL_T1_closingTime,Pip_dt,pUnit_conv)
|
||||||
|
|
||||||
KW_UL = Kraftwerk_class()
|
KW_UL = Kraftwerk_class()
|
||||||
KW_UL.add_turbine(UL_T1)
|
KW_UL.add_turbine(UL_T1)
|
||||||
|
|||||||
@@ -94,7 +94,7 @@
|
|||||||
"from functions.pressure_conversion import pressure_conversion\n",
|
"from functions.pressure_conversion import pressure_conversion\n",
|
||||||
"from Kraftwerk.Kraftwerk_class_file import Kraftwerk_class\n",
|
"from Kraftwerk.Kraftwerk_class_file import Kraftwerk_class\n",
|
||||||
"from Regler.Regler_class_file import PI_controller_class\n",
|
"from Regler.Regler_class_file import PI_controller_class\n",
|
||||||
"from Turbinen.Turbinen_class_file import Francis_Turbine"
|
"from Turbinen.Turbinen_class_file import Turbine"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -263,8 +263,8 @@
|
|||||||
"# create objects\n",
|
"# create objects\n",
|
||||||
"\n",
|
"\n",
|
||||||
"# influx setting turbines\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_T1 = 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_T2 = Turbine(OL_T2_Q_nenn,OL_T2_p_nenn,OL_T2_closingTime,Pip_dt,pUnit_conv)\n",
|
||||||
"\n",
|
"\n",
|
||||||
"KW_OL = Kraftwerk_class()\n",
|
"KW_OL = Kraftwerk_class()\n",
|
||||||
"KW_OL.add_turbine(OL_T1)\n",
|
"KW_OL.add_turbine(OL_T1)\n",
|
||||||
@@ -284,8 +284,8 @@
|
|||||||
"pipe.set_steady_state(flux_init,reservoir.get_current_pressure())\n",
|
"pipe.set_steady_state(flux_init,reservoir.get_current_pressure())\n",
|
||||||
"\n",
|
"\n",
|
||||||
"# downstream turbines\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_T1 = 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_T2 = Turbine(UL_T2_Q_nenn,UL_T2_p_nenn,UL_T2_closingTime,Pip_dt,pUnit_conv)\n",
|
||||||
"\n",
|
"\n",
|
||||||
"KW_UL = Kraftwerk_class()\n",
|
"KW_UL = Kraftwerk_class()\n",
|
||||||
"KW_UL.add_turbine(UL_T1)\n",
|
"KW_UL.add_turbine(UL_T1)\n",
|
||||||
|
|||||||
Reference in New Issue
Block a user