Skip to content

Commit 46025fc

Browse files
committed
Yuuuuuuuuuuuuup
1 parent 3015770 commit 46025fc

34 files changed

+1759
-5138
lines changed
File renamed without changes.

FroudeNumber.ipynb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2293,6 +2293,10 @@
22932293
"cell_type": "markdown",
22942294
"metadata": {},
22952295
"source": [
2296+
"# No longer developed because I don't know how to calculate it with the parameters in Delft3D\n",
2297+
"* How do I calculate 'channel depth'?\n",
2298+
"* Think it would still be interesting tho\n",
2299+
"\n",
22962300
"# Densimetric Froude number\n",
22972301
"\n",
22982302
"$Fr = \\frac{u}{\\sqrt{g'\\cdot L}}=\\frac{\\text{Layer averaged flow velocity}}{\\text{Wave velocity in shallow water}}=\\frac{\\text{Inertial forces}}{\\text{Gravity forces}}$\n",
@@ -2308,6 +2312,7 @@
23082312
"cell_type": "markdown",
23092313
"metadata": {},
23102314
"source": [
2315+
"\n",
23112316
"The densimetric Froude number represents (1) the ratio of the current speed to the speed of a long wave on the dense flow interface, and (2) the ratio between the destabilizing effects of velocity shearing (inertial forces) over the stabilizing effects of vertical density stratification (gravity/ buoyancy forces). The densimetric Froude number Frd is defined as"
23122317
]
23132318
},
@@ -3822,7 +3827,7 @@
38223827
"name": "python",
38233828
"nbconvert_exporter": "python",
38243829
"pygments_lexer": "ipython3",
3825-
"version": "3.7.5"
3830+
"version": "3.7.6"
38263831
}
38273832
},
38283833
"nbformat": 4,

GenerateBCRecords.ipynb

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
"metadata": {},
7373
"outputs": [],
7474
"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"
7777
]
7878
},
7979
{
@@ -103,10 +103,9 @@
103103
"metadata": {},
104104
"outputs": [],
105105
"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]"
110109
]
111110
},
112111
{
@@ -143,7 +142,10 @@
143142
{
144143
"data": {
145144
"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"
147149
],
148150
"text/plain": [
149151
"<IPython.core.display.Markdown object>"
@@ -156,7 +158,11 @@
156158
],
157159
"source": [
158160
"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+
"''') "
160166
]
161167
},
162168
{
@@ -181,7 +187,7 @@
181187
" '9.0000000e+000',\n",
182188
" '4.8000000e+001',\n",
183189
" '4.8300000e+001',\n",
184-
" '1.0200000e+003']"
190+
" '1.2300000e+003']"
185191
]
186192
},
187193
"execution_count": 11,
@@ -190,12 +196,13 @@
190196
}
191197
],
192198
"source": [
199+
"# TODO: hardcoded simultion start + edn time string\n",
193200
"times = [\"0.0000000e+000\", \n",
194201
" f\"{formatSci(pre_start_discharge_time)}\", \n",
195202
" f\"{formatSci(start_discharge_time)}\",\\\n",
196203
" f\"{formatSci(end_discharge_time)}\", \n",
197204
" f\"{formatSci(post_end_discharge_time)}\", \n",
198-
" \"1.0200000e+003\"]\n",
205+
" \"1.2300000e+003\"]\n",
199206
"times"
200207
]
201208
},
@@ -273,7 +280,7 @@
273280
"metadata": {},
274281
"outputs": [],
275282
"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",
277284
"sand_conc_records_discharge_layer = ' '.join(formatted_sand_conc for i in range(nr_discharge_layers))\n",
278285
"silt_conc_records_discharge_layer = ' '.join(formatted_silt_conc for i in range(nr_discharge_layers))\n",
279286
"\n",
@@ -596,7 +603,7 @@
596603
"data": {
597604
"text/markdown": [
598605
"\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"
600607
],
601608
"text/plain": [
602609
"<IPython.core.display.Markdown object>"
@@ -646,15 +653,15 @@
646653
"* Discharge duration = 39 min\n",
647654
"\n",
648655
"### 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",
651658
"\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",
655662
"\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",
658665
"* Total sediment concentration = 3.0%\n",
659666
"\n"
660667
],

0 commit comments

Comments
 (0)