Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WPTO for Matlab #61

Merged
merged 69 commits into from
Jan 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
f05a2fb
wpto playground
hivanov-nrel Jun 9, 2021
a22a033
format changes
hivanov-nrel Jul 6, 2021
ae48747
upload temporary test script
hivanov-nrel Aug 9, 2021
6439f3e
wpto extract with REST API
hivanov-nrel Aug 9, 2021
913d2ed
fix directional wave spectrum bug
hivanov-nrel Aug 17, 2021
b8b9bf7
upload hindcast example
hivanov-nrel Aug 17, 2021
039fa08
Merge branch 'MHKiT-Software:master' into master
hivanov-nrel Aug 17, 2021
dff00cb
auto format time_index into datetime array
hivanov-nrel Aug 23, 2021
f24b945
add tests for hindcast
hivanov-nrel Aug 23, 2021
432af17
remove temp file
hivanov-nrel Aug 23, 2021
9683c02
bug fix for available buoy data vs hindcast
hivanov-nrel Sep 3, 2021
a78f81c
upload data
hivanov-nrel Sep 27, 2021
39df6c9
moving test files into hindcast folder
rpauly18 Sep 27, 2021
356cd8a
updating toolbox paths
rpauly18 Sep 27, 2021
4813a3f
updating hindcast example
rpauly18 Sep 27, 2021
c016b31
Setup CI, v16.2, try to fix HDF5 issue, try fix outlined in Troublesh…
Matthew-Boyd Oct 29, 2021
fbce239
Setup CI, v16.3, try to fix HDF5 issue, try fix outlined in Troublesh…
Matthew-Boyd Oct 29, 2021
6e1a5bb
Setup CI, v16.4, try to fix HDF5 issue, try fix outlined in Troublesh…
Matthew-Boyd Oct 29, 2021
2b3a846
Setup CI, v16.5, try to fix HDF5 issue, try fix outlined in Troublesh…
Matthew-Boyd Oct 29, 2021
ccb2655
Setup CI, v16.6, try to fix HDF5 issue, try fix outlined in Troublesh…
Matthew-Boyd Oct 29, 2021
acdf864
Setup CI, v16.7, list installed toolboxes and addons
Matthew-Boyd Oct 29, 2021
9ac032f
Setup CI, v17, uninstall all pre-installed toolboxes
Matthew-Boyd Oct 29, 2021
026dcd4
Setup CI, v17.1, uninstall all pre-installed toolboxes
Matthew-Boyd Oct 29, 2021
0e01825
Setup CI, v17.2, toggle off all pre-installed toolboxes
Matthew-Boyd Oct 29, 2021
768b788
Setup CI, v17.3, toggle off all pre-installed toolboxes
Matthew-Boyd Oct 29, 2021
c08dd6e
Setup CI, v17.4, toggle off all pre-installed toolboxes
Matthew-Boyd Oct 29, 2021
ae1719e
Setup CI, v17.5, toggle off all pre-installed toolboxes
Matthew-Boyd Oct 29, 2021
e6f557b
Setup CI, v17.6, toggle off all pre-installed toolboxes
Matthew-Boyd Oct 29, 2021
d257e54
Setup CI, v17.7, toggle off all pre-installed toolboxes
Matthew-Boyd Oct 29, 2021
3931196
Setup CI, v17.8, toggle off all pre-installed toolboxes
Matthew-Boyd Oct 29, 2021
36f2cf3
Setup CI, v17.9, toggle off all pre-installed toolboxes
Matthew-Boyd Oct 30, 2021
bf5c6e4
Setup CI, v17.10, list installed addons and toolboxes
Matthew-Boyd Nov 19, 2021
6fbcccb
Setup CI, v17.11, start uninstalling toolboxes
Matthew-Boyd Nov 19, 2021
b2a4cb7
Setup CI, v17.12, start uninstalling toolboxes
Matthew-Boyd Nov 19, 2021
5f88f7f
Setup CI, v17.13, start uninstalling toolboxes
Matthew-Boyd Nov 19, 2021
911d772
Setup CI, v17.14, start uninstalling toolboxes
Matthew-Boyd Nov 19, 2021
397a942
Setup CI, v17.15, start uninstalling toolboxes
Matthew-Boyd Nov 19, 2021
1ea23f3
Setup CI, v17.16, start uninstalling toolboxes
Matthew-Boyd Nov 19, 2021
915c814
Setup CI, v17.17, start uninstalling toolboxes
Matthew-Boyd Nov 19, 2021
18b8f16
Setup CI, v17.18, start uninstalling toolboxes
Matthew-Boyd Nov 19, 2021
6a3756c
Setup CI, v17.19, start uninstalling toolboxes
Matthew-Boyd Nov 19, 2021
05a7f7f
Setup CI, v17.20, start uninstalling toolboxes
Matthew-Boyd Nov 20, 2021
2e6ef19
Setup CI, v17.21, start uninstalling toolboxes
Matthew-Boyd Nov 20, 2021
4a1dce4
Setup CI, v17.22, start uninstalling toolboxes
Matthew-Boyd Nov 20, 2021
57a4cc8
Setup CI, v17.23, start uninstalling toolboxes
Matthew-Boyd Nov 20, 2021
f2e840f
Setup CI, v17.24, start uninstalling toolboxes
Matthew-Boyd Nov 20, 2021
6e1ac94
Setup CI, v17.25, start uninstalling toolboxes
Matthew-Boyd Nov 20, 2021
d8d344a
Setup CI, v17.26, start uninstalling toolboxes
Matthew-Boyd Nov 20, 2021
e244857
Setup CI, v17.27, start uninstalling toolboxes
Matthew-Boyd Nov 20, 2021
8dae0f6
Setup CI, v17.28, start uninstalling toolboxes
Matthew-Boyd Nov 20, 2021
554c7cf
Setup CI, v17.29, start uninstalling toolboxes
Matthew-Boyd Nov 20, 2021
37e48c7
Setup CI, v17.30, start uninstalling toolboxes
Matthew-Boyd Nov 20, 2021
5468d0a
Setup CI, v17.31, start uninstalling toolboxes
Matthew-Boyd Nov 20, 2021
7ad0acf
Setup CI, v17.32, start uninstalling toolboxes
Matthew-Boyd Nov 20, 2021
3e8d32d
Setup CI, v17.33, start uninstalling toolboxes
Matthew-Boyd Nov 20, 2021
351bc78
Setup CI, v17.34, start uninstalling toolboxes
Matthew-Boyd Nov 20, 2021
b681055
Setup CI, v17.35, start uninstalling toolboxes
Matthew-Boyd Nov 20, 2021
5ce0479
Setup CI, v18, simplify to most basic test
Matthew-Boyd Nov 23, 2021
c6b43fa
Setup CI, v19, install mhkit toolbox
Matthew-Boyd Nov 23, 2021
6931cab
Setup CI, v20, run a single test that uses mhkit
Matthew-Boyd Nov 23, 2021
5025e57
Setup CI, v21, run a single different test that uses mhkit
Matthew-Boyd Nov 23, 2021
7dc9f9e
Setup CI, v21.1, run a single different test that uses mhkit
Matthew-Boyd Nov 23, 2021
bb95e9a
Setup CI, v21.2, run a single different test that uses mhkit
Matthew-Boyd Nov 23, 2021
15eefe0
Add function to reload python in matlab after python code changes
Matthew-Boyd Nov 24, 2021
0cce6cf
Fix paths to python usgs and noaa functions
Matthew-Boyd Nov 25, 2021
8c0a3f4
Update pierson_moskowitz_spectrum wrapper with additional Hs parameter
Matthew-Boyd Nov 25, 2021
50dba0d
Update create_spectra with additional Hs parameter
Matthew-Boyd Nov 25, 2021
32012fa
Update tests fixing mostly broken relative file paths
Matthew-Boyd Nov 25, 2021
dadc32f
Merge branch 'master' of github.com:MHKiT-Software/MHKiT-MATLAB into …
rpauly18 Jan 10, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 35 additions & 18 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,28 +36,45 @@ jobs:
- name: Set up MATLAB
uses: matlab-actions/setup-matlab@v1

- name: Query Python version used by MATLAB
uses: matlab-actions/run-command@v1
with:
command: pyversion()

- name: Install MHKiT toolbox in MATLAB
uses: matlab-actions/run-command@v1
with:
command: matlab.addons.toolbox.installToolbox('mhkit.mltbx')
# - name: Query Python version used by MATLAB
# uses: matlab-actions/run-command@v1
# with:
# command: pyversion()

- name: Uninstall MHKiT, for fixing HDF5 issue
run: |
python -m pip uninstall mhkit -y

- name: Re-install MHKiT, for fixing HDF5 issue
run: |
python -m pip install mhkit

- name: Re-install MHKiT toolbox in MATLAB, for fixing HDF5 issue
# This can cause segmentation violations
# - name: List installed MATLAB addons
# uses: matlab-actions/run-command@v1
# with:
# command: matlab.addons.installedAddons

# This can cause segmentation violations
# - name: List installed MATLAB toolboxes
# uses: matlab-actions/run-command@v1
# with:
# command: matlab.addons.toolbox.installedToolboxes
# alternative: command: ver

# - name: Toggle off all pre-installed toolboxes
# uses: matlab-actions/run-command@v1
# with:
# command: addpath('mhkit/utils'), uninstall_all_toolboxes
#
# - name: Uninstall h5py, for fixing HDF5 issue
# run: |
# python pip uninstall h5py -y
#
- name: Install MHKiT toolbox in MATLAB
uses: matlab-actions/run-command@v1
with:
command: matlab.addons.toolbox.installToolbox('mhkit.mltbx')
#
# - name: Uninstall MHKiT, for fixing HDF5 issue
# run: |
# python -m pip uninstall mhkit -y
#
# - name: Re-install MHKiT, for fixing HDF5 issue
# run: |
# python -m pip install mhkit

# - name: Change execution mode to out-of-process
# uses: matlab-actions/run-command@v1
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ test.egg-info/*
*.spec
**/build
**./dist/
*.csv
**/cache/
**/static/
.DS_Store
Expand Down
139 changes: 139 additions & 0 deletions examples/WPTO_hindcast_example.html

Large diffs are not rendered by default.

Binary file added examples/WPTO_hindcast_example.mlx
Binary file not shown.
8,749 changes: 8,749 additions & 0 deletions examples/data/wave/hindcast/hindcast_1hr_data.csv

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions examples/data/wave/hindcast/hindcast_1hr_meta.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
water_depth,latitude,longitude,distance_to_shore,timezone,jurisdiction
67.7445,44.567,-124.229,12353.165,-8,Federal
191.8491,43.08,-124.72,22735.91,-8,Federal
Loading