Merge branch 'Dev'

Untertweng.ipynb

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -24,7 +24,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -95,7 +95,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -136,7 +136,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 11,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -212,7 +212,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -247,12 +247,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [],
    "source": [
     "# needed for turbine convergence\n",
-    "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 time steps of the pipeline\n",
     "for it_pipe in range(1,nt+1):\n",
@@ -284,6 +284,7 @@
     "    # set boundary condition for the next timestep of the characteristic method\n",
     "    convergence_parameters[0] = p_old[-2]\n",
     "    convergence_parameters[1] = v_old[-2]\n",
+    "    convergence_parameters[9] = p_old[-1]\n",
     "    KW_UL.set_pressure(p_old[-1])\n",
     "    KW_UL.converge(convergence_parameters)\n",
     "    p_boundary_res[it_pipe] = reservoir.get_current_pressure()\n",
@@ -307,7 +308,7 @@
     "\n",
     "    # plot some stuff\n",
     "        # remove line-objects to autoscale axes (there is definetly a better way, but this works ¯\\_(ツ)_/¯ )\n",
-    "    if it_pipe%25 == 0:\n",
+    "    if it_pipe%100 == 0:\n",
     "        lo_p.remove()\n",
     "        lo_pmin.remove()\n",
     "        lo_pmax.remove()\n",
@@ -330,7 +331,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 14,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -396,7 +397,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 15,
    "metadata": {},
    "outputs": [],
    "source": [