Skip to content

Commit 144c78b

Browse files
authored
Merge pull request #181 from simmsa/prep_v1.0_release
Prep v1.0 release
2 parents 0ad774e + 9f73b23 commit 144c78b

7 files changed

Lines changed: 57 additions & 7 deletions

File tree

.github/workflows/unix_unit_tests.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
name: MHKiT-MATLAB Unix Unit Tests
22

3+
# Only run tests when MATLAB files or this workflow file changes
34
on:
45
push:
56
branches: [ master, develop ]
7+
paths:
8+
- 'mhkit/**/*.m'
9+
- 'examples/**/*.m'
10+
- '.github/workflows/unix_unit_tests.yml'
611
pull_request:
712
branches: [ master, develop ]
13+
paths:
14+
- 'mhkit/**/*.m'
15+
- 'examples/**/*.m'
16+
- '.github/workflows/unix_unit_tests.yml'
817

918
jobs:
1019
cache_population:

.github/workflows/windows_unit_tests.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
name: MHKiT-MATLAB Windows Unit Tests
22

3+
# Only run tests when MATLAB files or this workflow file changes
34
on:
45
push:
56
branches: [ master, develop ]
7+
paths:
8+
- 'mhkit/**/*.m'
9+
- 'examples/**/*.m'
10+
- '.github/workflows/windows_unit_tests.yml'
611
pull_request:
712
branches: [ master, develop ]
13+
paths:
14+
- 'mhkit/**/*.m'
15+
- 'examples/**/*.m'
16+
- '.github/workflows/windows_unit_tests.yml'
817

918
jobs:
1019
cache_population:

changelog.md

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
# Current development
1+
# Version 1.0.0
2+
3+
## Release Highlights
4+
5+
- New acoustics, and mooring modules
6+
- Improvements to Wave, WDRT, and DOLFYN modules
7+
- New examples for acoustics, mooring, and WEC-sim, and improved examples for DOLFYN and wave modules
8+
- Multiple bug fixes and performance improvements
9+
10+
## PR #174 - Acoustics Module
11+
12+
- Authors: @hivanov-nrel, @simmsa
13+
- Addition of acoustics module:
14+
- Reading and standardization of of OceanSonics icListen and OceanInstruments Soundtrap hydrophone files
15+
- Implementation of numerical computation sections IEC 62600-40 "Acoustic characterization of marine energy converters" standard
16+
- Spectrogram data visualizations using `plot_spectrogram`
17+
- Sound exposure level calculations with auditory weighting functions for 5 groups of marine mammals
18+
- Complete example livescript in examples/acoustics_example.mlx
219

320
## PR 176 - Wave Module Native MATLAB Implementation
421

@@ -21,6 +38,13 @@
2138
- Functions to visualize mooring line dynamics in 2D or 3D.
2239
- Example LiveScript demonstrating the functionality of the mooring module
2340

41+
## PR #173 - Dolfyn Turbulence Functionality
42+
43+
- Author: @simmsa, @browniea
44+
- Addition of turbulence calculations for acoustic doppler instruments
45+
- Turbulence intensity, noise, and reynolds stress calculations
46+
- Updates to examples/adcp_example.mlx live script
47+
2448
## PR 170 - WDRT leftovers
2549

2650
- Author: @hivanov-nrel
@@ -31,6 +55,14 @@
3155
- Author: @simmsa
3256
- Fix code compatibility issues detailed in issues #115, #116, #117, #118, #119, #120, #121, and #122
3357

58+
## Bug Fixes
59+
60+
- Issue #172 - Fix Failing MLER Test - @hivanov-nrel
61+
- Issue #152 - Fix dimensionality differences in environmental_contours_example - @simmsa
62+
- Issue #146, #74 - Finish WDRT Parity - @hivanov-nrel
63+
- Issue #145 - Fix build errors in documentation - @simmsa
64+
- Issue #114, #115, #116, #117, #118, #119, #121, #122 - MATLAB code compatibility issues
65+
3466
# MHKiT-MATLAB v0.6.0
3567

3668
## Release Highlights

mhkit/tests/Wave_TestIO.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ function test_swan_read_block(testCase)
111111
% WPTO multiple locations
112112
function test_WPTO_point_multiloc(testCase)
113113

114-
assumeFail(testCase, "API key usage saturated - temporarily disabling")
114+
% assumeFail(testCase, "API key usage saturated - temporarily disabling")
115115
% Error using matlab.internal.webservices.HTTPConnector/copyContentToByteArray (line 373)
116116
% The server returned the status 503 with message "Service Unavailable" in response to the request to URL
117117
% https://developer.nrel.gov/api/hsds/?api_key=3K3JQbjZmWctY0xmIfSYvYgtIcM3CN0cb1Y2w9bf&domain=%2Fnrel%2FUS_wave%2Fvirtual_buoy%2FWest_Coast%2FWest_Coast_virtual_buoy_2010.h5.
@@ -147,7 +147,7 @@ function test_WPTO_point_multiloc(testCase)
147147

148148
function test_WPTO_omnidirectional(testCase)
149149

150-
assumeFail(testCase, "API key usage saturated - temporarily disabling")
150+
% assumeFail(testCase, "API key usage saturated - temporarily disabling")
151151

152152
api_key = '3K3JQbjZmWctY0xmIfSYvYgtIcM3CN0cb1Y2w9bf';
153153
hindcast_data = request_wpto('1-hour',...
@@ -178,7 +178,7 @@ function test_WPTO_omnidirectional(testCase)
178178

179179
function test_WPTO_point_multiparm(testCase)
180180

181-
assumeFail(testCase, "API key usage saturated - temporarily disabling")
181+
% assumeFail(testCase, "API key usage saturated - temporarily disabling")
182182

183183
api_key = '3K3JQbjZmWctY0xmIfSYvYgtIcM3CN0cb1Y2w9bf';
184184
hindcast_data = request_wpto('3-hour',...

mhkit_python_utils/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
_warn.simplefilter(action="ignore", category=FutureWarning)
88

9-
__version__ = "0.7.0-dev.2"
9+
__version__ = "1.0.0"
1010

1111
__copyright__ = """
1212
Copyright 2019, Alliance for Sustainable Energy, LLC under the terms of

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ name = "mhkit_python_utils"
99
# Non Release version format:
1010
# - <Next Major (opt)>.<Next Minor>.Patch-<label>.Build, i.e., 0.7.0-dev.1
1111
# - Labels can be 'dev', 'alpha', 'beta', 'rc' (release candidate)
12-
version = "0.7.0-dev.2"
12+
version = "1.0.0"
1313
description = "A utility package that enables data exchange and interoperability between MHKiT-MATLAB and MHKiT-Python. Part of the MHKiT (Marine and Hydrokinetic Toolkit) project."
1414
readme = "README.md"
1515
requires-python = ">=3.10"

scripts/build_release.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
% 7 indicates a beta version
1919
% 6 indicates a release candidate version
2020
% i.e.: Development build for version 0.7.0-dev.2 would be 0.7.0.9002
21-
project_version = '0.7.0.9002';
21+
project_version = '1.0.0';
2222
matlab_minimum_release_supported = 'R2022b';
2323
summary = 'Marine energy data analysis and visualization toolbox';
2424
description = sprintf([ ...

0 commit comments

Comments
 (0)