Skip to content

Commit 262e3af

Browse files
brownieassolsonrpauly18Browning
authored
Delft3D io functions (MHKiT-Software#132)
* delft 3d ploting function * d3d flume data * Reorganized headers * Change Headers (#1) * changing path to data following organizational update * Reorganized headers Co-authored-by: rpauly18 <[email protected]> Co-authored-by: rpauly18 <[email protected]> * center line section * center line update * Add manual interpolation of variable * automated interpolation * adding xarray * Used dataframe for slicing * 3d interpolation in progress * added y interpolation * interpolation looping fixed * added z interpolation to centerline plots * added z interpolation * d3d with interpolation for irregular grid * psuedo code for new function get_variable_points * psuedo code for new function get_variable_points (#4) * plots center line plot for input points * added DataFrames * updated doc string * added creat_points code for a contour plot * updated creat_points centerlinea nd point logic * adding plot def, still has errors * Add files via upload * finged plotting isses * fixed plotting * changed d3d.irregualar_grids to d3d.py * added turbulence layers in get_all_data_points def * added turbulent intensity def * unneeded file * updated turbulent intensity * added unorm function and Turbulent intensity defal * updated labeling * Add Undefined points code (#5) * delft 3d ploting function * d3d flume data * Reorganized headers * Change Headers (#1) * changing path to data following organizational update * Reorganized headers Co-authored-by: rpauly18 <[email protected]> Co-authored-by: rpauly18 <[email protected]> * center line section * center line update * Add manual interpolation of variable * automated interpolation * adding xarray * Used dataframe for slicing * 3d interpolation in progress * starting with minimal try/except statement * added y interpolation * interpolation looping fixed * added z interpolation to centerline plots * added z interpolation * d3d with interpolation for irregular grid * psuedo code for new function get_variable_points * psuedo code for new function get_variable_points (#4) * unknown changes * adding warning * retrying build * removing warning * trying new key * editing .hscfg file * trying a different os * trying mac and windows * adding nose install to windows * modifting nostest call for windows * undoing last commit * trying pytest * try again * plots center line plot for input points * added DataFrames * reverting travis yml and upgrading h5pyd * fixing typo * re-adding warning message * updated doc string * added creat_points code for a contour plot * updated creat_points centerlinea nd point logic * updating virtual buoy results based on updated data (MHKiT-Software#107) * adding plot def, still has errors * Add files via upload * finged plotting isses * fixed plotting * changed d3d.irregualar_grids to d3d.py * added turbulence layers in get_all_data_points def * added turbulent intensity def * unneeded file * updated turbulent intensity * added unorm function and Turbulent intensity defal * updated labeling * Psuedo code for undefined points Co-authored-by: browniea <[email protected]> Co-authored-by: rpauly18 <[email protected]> Co-authored-by: rpauly18 <[email protected]> Co-authored-by: Emily Browning <[email protected]> Co-authored-by: Browning <[email protected]> * added assert statments * added ploting script to run d3d.py * updated bottom depth to be interpolated for wdir grid * added d3d function * updated file structure and bottom depth interpolation * changed name from io.py * updated file stucture * moved file to io folder under usgs.py * updated import statments * added assert statments * starting test * added test for d3d code * added new grid function * updated plots * added test for d3d.py * minor changes to fix test * removed plots_d3d * fixed file path to be compatable with lynix and apple os * made sugested revisions * removed old d3d file * undated testdir in line 14 * Add files via upload Adding the Flume data * chnaged file diretery to pull mane with __file__ * updated labels * added flume data * updated variable names * adding the example case for d3d.py code * fixed variable name in grid_data function * add d3d io funtions to tidal module * updated discriptions of d3d_example * made eddits to markdown discriptions * changed function outputs from arrays to DataFrames * updated test to take dataframe inputs * updated for dataframe outputs * updated for dataframe output updated * added boolian input to turbulnet_intesity fuction * fixed assert statment in turbulen_intesity function * fixed boolian input to turbulent intensity * fixed Turbulent intesity function * updated test_turbulent_intesity * fixed turbulent_intesity function for points= 'cells' input * updated grid_data for cells input * updated tunbulent_intesity function to nan negative values * updated turbulent_intesity examples * updated contour plots * changed grid_data to variable_interpolation * updated Turbulent_intesity negative filter to replace with 0 * added to the variable_interpolation block * updated assert statment and negative number filter on turbulent function * deleted old flume data * added to the variable_interpolation discription * added time steps (5) * fixed revewer comments * changed example data to turbineTest_map.nc * updated graph font size * Rename Delft3d_example.ipynb to Delft3D_example.ipynb * updated code for plot labels * updated spacing * updated code for plot formating * updated plot labels and limmits * updated formating * Delete turbineTest_map.nc will re-upload * will add back * add d3d example data folder * updated doc strings * deleting backup * deleting backup * updated spacing on doc strings * addressed some of @rpauly18 comments * made @rpauly18 sujested edits * added more inline comments * added more inline comments * fixed bug in create_points * added more inline code discriptions * updated discription of creat_points * fixed spelling on inline code comments * typo correction and cleanup * added examples * added unom function * add unorm function * removed unorm and improted from utils * added a few discrip discriptave details * added spaces on line 940 to reupload file * removed previous changes Co-authored-by: ssolson <[email protected]> Co-authored-by: ssolson <[email protected]> Co-authored-by: rpauly18 <[email protected]> Co-authored-by: rpauly18 <[email protected]> Co-authored-by: Browning <[email protected]>
1 parent 6e4bff0 commit 262e3af

File tree

10 files changed

+1768
-7
lines changed

10 files changed

+1768
-7
lines changed

examples/Delft3D_example.ipynb

Lines changed: 1154 additions & 0 deletions
Large diffs are not rendered by default.
21.1 MB
Binary file not shown.
3.61 MB
Binary file not shown.

examples/river_example.ipynb

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"cells": [
33
{
44
"cell_type": "markdown",
5-
"metadata": {},
5+
"metadata": {
6+
"tags": []
7+
},
68
"source": [
79
"# MHKiT River Module\n",
810
"\n",
@@ -21,6 +23,14 @@
2123
"from mhkit import river"
2224
]
2325
},
26+
{
27+
"cell_type": "markdown",
28+
"metadata": {},
29+
"source": [
30+
"\n",
31+
"## Test\n"
32+
]
33+
},
2434
{
2535
"cell_type": "markdown",
2636
"metadata": {},
@@ -369,7 +379,7 @@
369379
"name": "python",
370380
"nbconvert_exporter": "python",
371381
"pygments_lexer": "ipython3",
372-
"version": "3.8.5"
382+
"version": "3.8.8"
373383
}
374384
},
375385
"nbformat": 4,

mhkit/river/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from mhkit.river import performance
22
from mhkit.river import graphics
3-
from mhkit.river import io
43
from mhkit.river import resource
4+
from mhkit.river import io
5+

mhkit/river/io/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
from mhkit.river.io import usgs
2+
from mhkit.river.io import d3d

0 commit comments

Comments
 (0)