small changes

This commit is contained in:
Brantegger Georg
2023-02-09 13:11:02 +01:00
parent 1218939752
commit df0fb4f0ed
7 changed files with 48 additions and 32 deletions

View File

@@ -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": [