|
72 | 72 | "metadata": {},
|
73 | 73 | "outputs": [],
|
74 | 74 | "source": [
|
75 |
| - "sand_weight_vol = 39.74 # [kg/m3] # 19.875 # 25%\n", |
76 |
| - "silt_weight_vol = 39.74 # [kg/m3] # 59.625 # 75%" |
| 75 | + "sand_weight_vol = 19.875 # [kg/m3] # # 25% 39.74\n", |
| 76 | + "silt_weight_vol = 59.625 # [kg/m3] # # 75% 39.74" |
77 | 77 | ]
|
78 | 78 | },
|
79 | 79 | {
|
|
103 | 103 | "metadata": {},
|
104 | 104 | "outputs": [],
|
105 | 105 | "source": [
|
106 |
| - "timestep = 0.3 # ureg.minute [min]\n", |
107 |
| - "start_discharge_time = 9 # ureg.minute [min]\n", |
108 |
| - "end_discharge_time = 48 # ureg.minute [min]\n", |
109 |
| - "# end_discharge_time = 123 # ureg.minute [min]" |
| 106 | + "timestep = 0.3 # [min]\n", |
| 107 | + "start_discharge_time = 9 # [min]\n", |
| 108 | + "end_discharge_time = 48 # [min]" |
110 | 109 | ]
|
111 | 110 | },
|
112 | 111 | {
|
|
143 | 142 | {
|
144 | 143 | "data": {
|
145 | 144 | "text/markdown": [
|
146 |
| - "Is multiple of timestep? It is! if True" |
| 145 | + "\n", |
| 146 | + "# Sanity check\n", |
| 147 | + "Weird check for floating point errors\n", |
| 148 | + "## Is multiple of timestep? True!\n" |
147 | 149 | ],
|
148 | 150 | "text/plain": [
|
149 | 151 | "<IPython.core.display.Markdown object>"
|
|
156 | 158 | ],
|
157 | 159 | "source": [
|
158 | 160 | "from decimal import Decimal\n",
|
159 |
| - "md(f\"Is multiple of timestep? It is! if {Decimal(discharge_duration) % Decimal(timestep) < 10e-9}\") # weird check due to floatin point errors" |
| 161 | + "md(f'''\n", |
| 162 | + "# Sanity check\n", |
| 163 | + "Weird check for floating point errors\n", |
| 164 | + "## Is multiple of timestep? {Decimal(discharge_duration) % Decimal(timestep) < 10e-9}!\n", |
| 165 | + "''') " |
160 | 166 | ]
|
161 | 167 | },
|
162 | 168 | {
|
|
181 | 187 | " '9.0000000e+000',\n",
|
182 | 188 | " '4.8000000e+001',\n",
|
183 | 189 | " '4.8300000e+001',\n",
|
184 |
| - " '1.0200000e+003']" |
| 190 | + " '1.2300000e+003']" |
185 | 191 | ]
|
186 | 192 | },
|
187 | 193 | "execution_count": 11,
|
|
190 | 196 | }
|
191 | 197 | ],
|
192 | 198 | "source": [
|
| 199 | + "# TODO: hardcoded simultion start + edn time string\n", |
193 | 200 | "times = [\"0.0000000e+000\", \n",
|
194 | 201 | " f\"{formatSci(pre_start_discharge_time)}\", \n",
|
195 | 202 | " f\"{formatSci(start_discharge_time)}\",\\\n",
|
196 | 203 | " f\"{formatSci(end_discharge_time)}\", \n",
|
197 | 204 | " f\"{formatSci(post_end_discharge_time)}\", \n",
|
198 |
| - " \"1.0200000e+003\"]\n", |
| 205 | + " \"1.2300000e+003\"]\n", |
199 | 206 | "times"
|
200 | 207 | ]
|
201 | 208 | },
|
|
273 | 280 | "metadata": {},
|
274 | 281 | "outputs": [],
|
275 | 282 | "source": [
|
276 |
| - "# TODO: should loop over sediments and then write each line\n", |
| 283 | + "# TODO: should loop over arrray of sediments and then write each line but for only two like now it works fine\n", |
277 | 284 | "sand_conc_records_discharge_layer = ' '.join(formatted_sand_conc for i in range(nr_discharge_layers))\n",
|
278 | 285 | "silt_conc_records_discharge_layer = ' '.join(formatted_silt_conc for i in range(nr_discharge_layers))\n",
|
279 | 286 | "\n",
|
|
596 | 603 | "data": {
|
597 | 604 | "text/markdown": [
|
598 | 605 | "\n",
|
599 |
| - "* **Total sediment volume flowing in = 3.1582052830188676 $\\times10^5 m^3$**\n" |
| 606 | + "* **Total sediment volume flowing in = 3.159 $\\times10^5 m^3$**\n" |
600 | 607 | ],
|
601 | 608 | "text/plain": [
|
602 | 609 | "<IPython.core.display.Markdown object>"
|
|
646 | 653 | "* Discharge duration = 39 min\n",
|
647 | 654 | "\n",
|
648 | 655 | "### Sediments\n",
|
649 |
| - "* Silt weight per volume = 39.74 $kg/m^3$\n", |
650 |
| - "* Sand weight per volume = 39.74 $kg/m^3$\n", |
| 656 | + "* Silt weight per volume = 59.625 $kg/m^3$\n", |
| 657 | + "* Sand weight per volume = 19.875 $kg/m^3$\n", |
651 | 658 | "\n",
|
652 |
| - "* Total silt volume 1.58 $\\times10^5 m^3$\n", |
653 |
| - "* Total sand volume 1.58 $\\times10^5 m^3$\n", |
654 |
| - "* **Total sediment volume = 3.158 $\\times10^5 m^3$**\n", |
| 659 | + "* Total silt volume 0.79 $\\times10^5 m^3$\n", |
| 660 | + "* Total sand volume 2.37 $\\times10^5 m^3$\n", |
| 661 | + "* **Total sediment volume = 3.159 $\\times10^5 m^3$**\n", |
655 | 662 | "\n",
|
656 |
| - "* Silt Concentration = 1.5%\n", |
657 |
| - "* Sand Concentration = 1.5%\n", |
| 663 | + "* Silt Concentration = 2.25%\n", |
| 664 | + "* Sand Concentration = 0.75%\n", |
658 | 665 | "* Total sediment concentration = 3.0%\n",
|
659 | 666 | "\n"
|
660 | 667 | ],
|
|
0 commit comments