Skip to content

Conversation

@ssolson
Copy link
Contributor

@ssolson ssolson commented Oct 3, 2022

This PR improves the testing structure of MHKit by:

  1. Switching testing from nosetest (deprecated) to pytest
  2. Including coverage for pip and conda installation
  3. Breaking out calls to the hindcast module to its own serialized job with dedicated coverage. This will avoid the issues of overlapping calls that crashed the API in the past. This was achieved via configuration files for both pytest and coverage indicating to the testing module which files should be run and included in the coverage report.

Each of these recommendations was suggested to us in #183.

This PR additionally applies a temporary NetCDF version pin to the previous release to fix issues with pip installation (#177) and allow tests to pass.

An additional issue around bandwidth related NREL's HSDS API occurred while working on this issue. In order to clear out the current backlog of PRs we are closing this PR with the following limitations:

  1. No hindcast tests are being run (these call the NREL HSDS API)
  2. mhkit pip and python 3.7 are not being tested (there is an issue with dolyfn). A conda install is working and being tested.
  3. netCDF version is currently pinned to 1.5.8 (not the most recent)

@ssolson ssolson mentioned this pull request Oct 4, 2022
4 tasks
@ssolson
Copy link
Contributor Author

ssolson commented Oct 19, 2022

Not necessary at this time but I want to document here the issues which seem to mostly arise around the use of py 3.7. In the future, we will look to deprecate 3.7.

image

@ssolson
Copy link
Contributor Author

ssolson commented Oct 21, 2022

Okay so there is an issue I have been chasing down now regarding the hindcast tests. test_multi_loc is continually returning a 0 array for the data being passed in the test. The error returned from the test:
FAILED ::TestWPTOhindcast::test_multi_loc - ValueError: cannot reshape array of size 0 into shape (8748,29,24,1)

This is occurring inside of hypyd in a call that converts bytesToArray:

data = b'', dt = dtype('float32'), shape = (8748, 29, 24, 1)

    def bytesToArray(data, dt, shape):
        nelements = getNumElements(shape)

        if not isVlen(dt):
            # regular numpy from string
            arr = np.frombuffer(data, dtype=dt)
        else:
            arr = np.zeros((nelements,), dtype=dt)
            offset = 0
            for index in range(nelements):
                offset = readElement(data, offset, arr, index, dt)

        if shape is not None:
            if shape == () and dt.shape:
                # special case for scalar array with array sub-type
                arr = arr.reshape(dt.shape)
            else:
>               arr = arr.reshape(shape)
E               ValueError: cannot reshape array of size 0 into shape (8748,29,24,1)

..\..\anaconda3\lib\site-packages\h5pyd\_hl\base.py:569: ValueError

Something has changed in our dependencies and I have not at this time I have not been able to track down what is breaking this test.

@ssolson
Copy link
Contributor Author

ssolson commented Oct 24, 2022

@rpauly18 there is some issue with rex causing the tests to fail.

Specifically: The parameter directional_wave_spectrum when calling get_lat_lon_df on the path: '/nrel/US_wave/virtual_buoy/West_Coast/West_Coast_virtual_buoy_1995.h5'.

E.g.:

from rex import WaveX

year='1995'
region = wave.io.hindcast.region_selection((43.489171,-125.152137))
wave_path = f'/nrel/US_wave/virtual_buoy/'+region+'/'+region+'_virtual_buoy_'+year+'.h5'

with WaveX(wave_path, hsds=True) as rex_waves:
    meta = rex_waves.meta
    time_index = rex_waves.time_index
    data_raw = rex_waves.get_lat_lon_df('directional_wave_spectrum',(43.489171,-125.152137))

I have found that switching the parameter to energy_period will return the correct data as expected. The above example is the simplest way to reproduce the error from our testing suite. The exact error is found in test_multi_loc when it specifically calls the hindcast module function request_wpto_directional_spectrum.

request_wpto_directional_spectrum uses additional kwargs in the call to WaveX but the error returned by the code above is the same.

Since you wrote this module I wanted to reach out to you to see if you had any idea to try anything I had not yet. I will go ahead and reach out to the rex team using my example above to see if they can offer any insight.

@ssolson
Copy link
Contributor Author

ssolson commented Oct 24, 2022

NREL/rex#133 (comment)

@akeeste
Copy link
Contributor

akeeste commented Nov 3, 2022

@ssolson @rpauly18 Our PR backlog continues to grow, so I have a couple suggestions for an immediate path forward:

  • Immediately review/merge this PR with the current pip installation fixes. Move anything required for the rex tests into a new PR, so that our Develop branch PRs can be merged
  • Merge the PRs into the Develop branch regardless of this status, since that is the benefit of having an unstable working branch.

Any thoughts on this workflow? #187, #193, #196, #197 are all reviewed and more or less ready to merge, pending some issues with tests. I'd be great to merge these PRs sometime next week using one of the above options

@ssolson
Copy link
Contributor Author

ssolson commented Nov 3, 2022

It would be very easy to comment out the hindcast tests the way I have set it up. The reason I had not suggested this is primarily because it means we are not testing our whole package for breaking changes from new PRs. I think your plan works for #193, #196, and #197 but since #187 uses rex it needs to be added to the serialized portion of the tests and I would not recommend it for inclusion until after getting the current issues worked out.

@akeeste
Copy link
Contributor

akeeste commented Nov 3, 2022

That makes sense about #187. I agree that we will not be fully checking PRs as they come in, but any breaking updates would be isolated to the Develop branch. This way we can keep up with development and once the tests are fixed, they should identify any outstanding issues. Can you give an update on the status of this PR for the other versioning/platform issues aside from rex?

@ssolson
Copy link
Contributor Author

ssolson commented Nov 3, 2022

To get your plan working for this PR I need to

  1. Comment out the hindcast job in the main.yml file
  2. Add back in all OS and Py versions to the other tests.

I will go ahead and do that now since it is so easy.

@akeeste
Copy link
Contributor

akeeste commented Nov 3, 2022

@ssolson Thanks, when you're ready can you mark the PR ready for review? I'll find time to review this and hopefully merge a couple other PRs before I'm out of office.

@ssolson
Copy link
Contributor Author

ssolson commented Nov 4, 2022

Guys I have completed the follow up with Grant with is final comments and recommendations here NREL/rex#133 (comment).

...here are some observations based on what we've tried:

  1. Neither of us seem to be able to pull the full data volume from that dataset
  2. The errors are being raised by h5pyd, not rex, and appear to be saying "no data has been returned"
  3. Smaller datasets or a slice of the spectrum dataset are retrieved just fine
  4. The original code requesting the spectrum data in dataframe works fine when pointing to the Eagle datasets
    Given the above, I think the issue is in bandwidth limitations on the NREL HSDS API. It could be that your bandwidth limit was > recently reduced, which would appear like something changed in the code that is just now causing failures but in reality is an > external change.

My recommendations right now are to either 1) stand up your own HSDS service so you can control your data streaming or > > 2) reach out to the NREL developer network to get your bandwidth increased.

In summary, it seems that the bandwidth of the NREL HSDS was reduced recently. He suggests we set up our own HSDS which I believe is quite firmly outside the scope of this project or reach out to the NREL developer network. I think we should go with the second option. @rpauly18 I am happy to move forward with this option but wanted to check with you on if you had contacts over there.

@ssolson
Copy link
Contributor Author

ssolson commented Nov 4, 2022

@akeeste I expect these tests to pass and will remove from draft status when they do. I have updated the header post to this PR which captures the limitations/ compromise of the testing suite we are pushing to the develop branch.

  1. No hindcast tests are being run (these call the NREL HSDS API)
  2. mhkit pip and python 3.7 are not being tested (there is an issue with dolyfn). A conda install of py3.7 is working and being tested.
  3. netCDF version is currently pinned to 1.5.8 (not the most recent)

@ssolson ssolson marked this pull request as ready for review November 4, 2022 15:37
Copy link
Contributor

@akeeste akeeste left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @ssolson! This looks good to me. I think you've well documented what our current testing status is and what we have left out, so that we can come back to it after sorting through the other issues.

@ssolson ssolson merged commit d5afab4 into MHKiT-Software:Develop Nov 5, 2022
@ssolson ssolson deleted the tests branch February 1, 2023 15:34
ssolson added a commit that referenced this pull request Feb 10, 2023
* Merge Master into Develop (#179)

* Include last day of year (#160)

Include the last day of the year when using years parameter. Fixes #154.

* Timezone Bug fix: remove `.replace()` for `.astimezone()` (#161)

* Bug fix: remove timezone replace for astimezone

* add pytz to required packages

* Fix: Pandas latest (#159)

* Plot each col in DataFrame individually

* Remove numpy and pandas version requirements

* WDRT (#141)

* Working version of Gaussian Copula

* Create dedicated function for iso probs and quantiles

* Contour plots worsk for single and multiple contours

* Gumbel Copula.

* Clayton Copula

* Rosenblatt Copula

* Guass and gumbel general copula

* Add support for nonparametric gaussian, clayton, and gumbel copulas

* Require statsmodel for nonparametric KDE copulas

* Small changes

* Fix bug in KDE log transformation

* Adding docstrings

* All doc strings updated

* Add markers option to contours plotting

* Add Copula tests comparing to WDRTresults

* Fix x1, x2 pts bug in KDE contour, clean up

* Example showing the calculation of all copla methods and comparing to WDRT results

* Simplifications and lanuguage cleanup

* Add statsmodel

* Add testing data files

* In plot envrionmental contors convert x1,x2 to values if a Series is passed

* Docstring typo corrections

* Corrected notebook description typos.

* module and example for short-term extreme distributions

* docstrings for short-term extreme functions

* fixes #140 Speedup surface elevation calculation.

* correction to surface_elevation

* elevation

* minor fixes based on review comments

* add environmental_contours to init

* Remove WDRT functionality

* All WDRT contour functionality can be called from one function

* Rework tests for new contour functions setup and location

* Move all contour example into this file

* Update to work with new structure.

* Remove all commented out wdrt functions from resource

* No changes made. Reverting back.

* Have PCA method use general fit. Adds PCAmethod to fit method but can also accept the PCA dictionary. General Docstring Cleanup

* Update discussion around the use of the copula method.

* Remove copula stand alone notebook

* minor formmating changes

* Remove test bugs created from merge with origin

* Import env contours into resource module and adjust test, examples, ect to function with tthe new structure

* Uncommented tests

* Remove reference to import the env contours module

* fixing minor typo

* Move env contours to _file and adjust package to handle new structure

* Minor formatting cleanup

* Cleanup unsed packages and variables

* intial mler upload

* formalize functions

* add tests and example

* sampling rate to averaging period

* rename MLER example

* working

* merging

* WDRT functions and examples finalized. Missing tests.

* integrate mler into extreme

* fixes tests?

* fix tests

* fix tests

* fix full sea state example?

* test contour samples

* test sample full seastate

* random seed

* test long term extreme

* expand MLER functionality

* test short-term extremes

* fix mler tests

* MLER test error

* mler fix 2

* update formats and asserts

* further cleanup of countours.py for consistency, typos, and pep8

* run tests?

* fix test?

* change lists to np.array so they pass the assert statements

* clean extreme.py for consistency, pep8

* points_per_interval should be int

* typing in examples

* full sea state example: make it easier to follow, add more explanation, and use consistent naming

* contour example: make it easier to follow, add more explanation, and use consistent naming

* Alias ste function and minor formatting.

* naming convention

* rename example

* ste example

* allow weights to be np.array

* allow weights to be np.ndarray

Co-authored-by: ssolson <[email protected]>
Co-authored-by: ssolson <[email protected]>
Co-authored-by: rpauly18 <[email protected]>
Co-authored-by: hivanov-nrel <[email protected]>

* DOLfYN IO (#126)

* input output files
+ testing

* Code update

* Test reformatting

* Testing paths

* dependency switch from h5netcdf to netcdf4

* Code cleanup

* Test import fix

* Minor docstring edits

* Add dolfyn test data

* Test fixes for mhkit

* Removing uneeded test files, improving consistency

* Not sure why these files didn't upload

* Organizational changes and clarifications. Request for additional clarification

* Dolfyn codebase updates

* Dolfyn example notebooks update

* Testing updates

* Update example datafile

* Latest dolfyn v0.13.0 updates

* Name change

* input output files
+ testing

* Code update

* Organizational changes and clarifications. Request for additional clarification

* Dolfyn codebase updates

* fix bug and make faster. Un-hard-code default seed/phase.

* fix tests

* delete commented out tests

* retrigger checks

* Checkpoint push

* New dolfyn data files

* Reorganize dolfyn testing

* pytest install for warnings tests

* Final update for IO

* Remove future updates

* Ensure file compression runs

* Update numpy dependency

* trying numpy v1.22

* changing numpy requirements

* Remake unittest test cases

* Save format options

* Add dolfyn view to notebooks

* Decode remaining binary ad2cp variables

* DOLfYN 1.0.0 dependency

Co-authored-by: jmcvey3 <[email protected]>
Co-authored-by: ssolson <[email protected]>
Co-authored-by: Michelen <[email protected]>
Co-authored-by: jmcvey3 <[email protected]>
Co-authored-by: rpauly18 <[email protected]>

* regenerate WDRT examples (#163)

* updating version number in package

* fixing dolfyn imports from pip

* updating version number for bug fix

* NDBC Metocean data (#152)

* catch extra header in ndbc data

* NDBC cwind example

* update unit catch in request_data

* update gust plot to show more data

* add tests to read cwind with and without units

* move graphics import to ndbc module and fix capitalization

* use resample, add gridlines, rename variables, replace NDBC nans up front

* rename wind_example to metocean_example

* adding "Develop" branch to PR

Co-authored-by: Carlos A. Michelén Ströfer <[email protected]>
Co-authored-by: rpauly18 <[email protected]>
Co-authored-by: hivanov-nrel <[email protected]>
Co-authored-by: jmcvey3 <[email protected]>
Co-authored-by: jmcvey3 <[email protected]>
Co-authored-by: jmcvey3 <[email protected]>
Co-authored-by: rpauly18 <[email protected]>
Co-authored-by: Adam Keester <[email protected]>

* Test Suite Restructure (#174)

* test_wave file to folder with individual feature files

* Move io tests into io folder

* Send plots to a plots folder

* Move resource characterizations plot tests into resource metrics file

* move load tests to folder

* move power tests to folder

* move river tests to folder

* move tidal tests to folder

* move utils tests to folder

* add inits so that tests pick up the tests in subfolders

* Require previous netCDF4 release.

* FIx data directory path

* Fix data directory path

* Fix load data directory path

* Remove relpath call to see if it fixes Windows test suite issues

* Remove relpath from the rest of io tests in wave

* DOLfYN source code (#169)

* Initial push

* Latest bugfixes

* Remove phase-in text

* Update docstrings

* Readability, imports

* Make functions public

* Docstring updates

* Fix test oversight

* Fix docstring

* Missing timestamp fix for classic Nortek

* Docstring updates

* Renaming functions per mhkit standards

* Single array vs binned array functions

* Reorganizing analysis code

* Update invalid orientation matrix warning

* Add config details to dataset attributes

* dolfyn bugfixes

Co-authored-by: jmcvey3 <[email protected]>

* Delft 3D Timestep to Seconds Function (#168)

* fixing file history

* fixing file history

* fixing file history

* made revisions from ssolson review

* changed time_stamp to timestamp

* updated varible names

* updated variable names

* fixed syntax line 63

* umdated variable name

* fixed typos in doc strings

* ssolson review 5-26-2022

* deleted excessive code in get_all_data

* chaged TI to a % from a fraction

* adjusted TI test to be a %

* fixed doc string for TI function

* Docstring adjustments

* updated doc strings

* Make convert_time a hidden func, make 2 functions to access it

* Minor changes to get_lay_data docstring and formatting

* small changes

* remove print from create_points

* example notebook clean up

* fixed merge confilics

* updated after merge

* final developmet barnach merge updates

* deleated space

* Delete test_river.py

* added coverage to test

* updated min and max plot labels

Co-authored-by: Browning <[email protected]>
Co-authored-by: ssolson <[email protected]>

* NetCDF4 (#181)

* Use conda TEST env on Py 3.7, 3.8, 3.9

* Use pip install with Py 3.8 and 3.9.

* Updates for WEC-Sim v5.0 (#185)

* update read_wecsim for WEC-Sim v5.0

* add cable class

* update notebook with results

* add try-except for Morrison (v4.1) vs Morison (v4.2+)

* add cable check and dataset to wave tests

* update cable dataset

* Fix pip install tests (#194)

* Require previous version of NetCDF4.

* Use original pre install for environemnt in pip tests

* Only test pip

* No loading shell PATH

* Do not upgrade h5py

* Set NETCDF to 1.5.8

* pytest and coverage

* yaml syntax fix

* Change need to pip-build

* Control coverage and test via rc files

* Move configuration file to workflows directory

* Move configuration file to workflows directory

* Specify the location of configuration files in coverage/pytest call

* run conda & pip, pass both to coveralls

* conda bash -l {0}

* Add hindcast build which runs serial

* configuration files for hindcast run

* Specify hindcast configuration for hindcast build

* Remove version specification from hindcast calls

* Specify configuration files to include/omit hindcast accordingly

* Change job name

* Fix configuration to hindcast file not test

* Use all OS and py versions in tests

* pandas <=1.5.0

* xarray <=2022.9.0

* Only hindcast

* Clean up package install

* Fixing hypy and h5pyd to previous versions

* Run limited other tests

* No hindcast tests

* remove hindcast comments and coveralls call

* remove py3.8 from pip build

* requirements.txt netCDF <= 1.5.8

* Add function to compute value at a given return period (#193)

* Run CI on push to Develop (#200)

* Dolfyn general updates (#186)

* Initial push

* Latest bugfixes

* Remove phase-in text

* Update docstrings

* Readability, imports

* Make functions public

* Docstring updates

* Fix test oversight

* Fix docstring

* Missing timestamp fix for classic Nortek

* Docstring updates

* Renaming functions per mhkit standards

* Single array vs binned array functions

* Reorganizing analysis code

* Update invalid orientation matrix warning

* Add config details to dataset attributes

* dolfyn bugfixes

* ADV updates
:

* Update compression option for netcdf4

* Remove compression options

* Fix clean function

* Set functions as private

* Move stress functions to ADV dir

* Add bottleneck to reqs

* Minor changes

* Remove old functions

* Code simplification

* Update examples

* Make functions public

* Add bottleneck to dependencies

* Fix notebook

* Bugfix for beam vars

Co-authored-by: jmcvey3 <[email protected]>

* Delft3D z calculation (#190)

* updated variable names

* updated variable names

* updated variable names

* fixed a few docstring typos

* updated s1 to water level

* updated s1 to waterlevel

* updated s1 to waterlevel

* updated s1 to water level

* updated s1 to waterlever

* fixed typo depth to waterdepth

* added edges = nearest example

* added edges = nearest option in variable interpolate

* updated z to waterdepth

* added edges= nearest example

Co-authored-by: Browning <[email protected]>

* Directional NDBC  (#197)

* working on directional NDBC

* clean up functions. Write docstrings. Write assert statements. Write tests. Create Tutorial.

* docstring and asserts for plotting function

* Bug Fix: Averaging histogram bin and wave energy (#205)

* Fix averaging bug
* Add outline to bin counts text for better contrast
* Update plotting function and plot in example notebook

* Fix: update variable name to remove reference before assignment error (#208)

* update wave.contours.samples_contour to not get variable referenced before assignment error

Co-authored-by: Graham Penrose <[email protected]>

* HSDS (#211)

Adds hindcast tests back into the test suite. The NREL HSDS API issues were resolved by creating multiple calls to the API for direction wave spectrum requests. Additionally, an exponential back-off time was implemented to retry calls with an increased wait time between calls.

Co-authored-by: Adam Keester <[email protected]>

* Provide function to convert from Te to Tp using ITTC approximation (#210)

* Provide function to convert from Te to Tp using ITTC approximation

* Apply suggestions from code review

Co-authored-by: Adam Keester <[email protected]>

* Metocean module - WIND Toolkit (#187)

* initial script

* update wind_toolkit with 4 regions and 1-hr or 5-min data

* update parameters of wind_toolkit functions

* compare NDBC and WIND metocean data

* fix typo in wpto hindcast example

* finish metocean example and add results

* add wind_toolkit to wave/io/__init__.py

* update WIND Toolkit parameter list

* initial test structure for WIND toolkit

* finish metocean example

* add function to plot each region

* wind toolkit tests and test data

* add tests for misc wind_toolkit MHKiT functions and cases

* fix wind toolkit tests

* add elevation_to_string utility function

* misc cleanup

* clarify available parameters

* add users lat_lon to plot_region visualization

* update example with new functions

* add numpy dependency back in

* Ingnore the new hindcast folder

* Include only the new hindcast folder

* Move hindcast tests to hindcast folder

* Specify exclusion of hindcast from standard coverage

* update hindcast coverage

* remove unnecessary header

* move hindcast and wind_toolkit to wave/io/hindcast

* update .coveragerc files

* update paths for new wave.io.hindcast directory

Co-authored-by: ssolson <[email protected]>

* Dolfyn updates (#212)

* RDI reader, logging, duty cycle motion correction

* Updates

* Force float32 datatype

* Docstring formatting

* Change 'default' docstring default

* Remove old comments

* Trasect comparison (#199)

* Require previous version of NetCDF4.

* updated variable names

* updated variable names

* updated variable names

* fixed a few docstring typos

* updated s1 to water level

* updated s1 to waterlevel

* updated s1 to waterlevel

* updated s1 to water level

* updated s1 to waterlever

* fixed typo depth to waterdepth

* D3d Tanana Transect Example

* added optional edge interpolation with nearest

* updated z to water depth

* RDI reader, logging, duty cycle motion correction

* add dolfyn, currenly will not run on the branch need jmcvey3 trdi_5beam

* found river bottom and removed data below

* Updates

* Force float32 datatype

* added downsampelind comparison and tried contourf

* D3D tanana data

* tanana transect 2

* tanana transect 3

* Docstring formatting

* Change 'default' docstring default

* Remove old comments

* updated code to match Energies paper

* Review

* Boat transect image

* updated variable names

* updated variable names

* updated variable names added to discriptions

* Clean up and suggestions

* added to the examples

* TRTS study edits

* code and discription updates

* Edits and TODOs

* moved files, updated discriptions

* readding Delft3D_example notebook

* added USGS discharge

* updated doc strings

* example updates and move data files

* updated doc strings and Error equations

* updated doc strings

* pulled down development branch

---------

Co-authored-by: ssolson <[email protected]>
Co-authored-by: Browning <[email protected]>
Co-authored-by: jmcvey3 <[email protected]>

---------

Co-authored-by: Carlos A. Michelén Ströfer <[email protected]>
Co-authored-by: rpauly18 <[email protected]>
Co-authored-by: hivanov-nrel <[email protected]>
Co-authored-by: jmcvey3 <[email protected]>
Co-authored-by: jmcvey3 <[email protected]>
Co-authored-by: jmcvey3 <[email protected]>
Co-authored-by: rpauly18 <[email protected]>
Co-authored-by: Adam Keester <[email protected]>
Co-authored-by: Emily Browning <[email protected]>
Co-authored-by: Browning <[email protected]>
Co-authored-by: Mark Bruggemann <[email protected]>
Co-authored-by: Graham Penrose <[email protected]>
ssolson added a commit that referenced this pull request May 8, 2023
* Require previous version of NetCDF4.

* Merge Master into Develop (#179)

* Include last day of year (#160)

Include the last day of the year when using years parameter. Fixes #154.

* Timezone Bug fix: remove `.replace()` for `.astimezone()` (#161)

* Bug fix: remove timezone replace for astimezone

* add pytz to required packages

* Fix: Pandas latest (#159)

* Plot each col in DataFrame individually

* Remove numpy and pandas version requirements

* WDRT (#141)

* Working version of Gaussian Copula

* Create dedicated function for iso probs and quantiles

* Contour plots worsk for single and multiple contours

* Gumbel Copula.

* Clayton Copula

* Rosenblatt Copula

* Guass and gumbel general copula

* Add support for nonparametric gaussian, clayton, and gumbel copulas

* Require statsmodel for nonparametric KDE copulas

* Small changes

* Fix bug in KDE log transformation

* Adding docstrings

* All doc strings updated

* Add markers option to contours plotting

* Add Copula tests comparing to WDRTresults

* Fix x1, x2 pts bug in KDE contour, clean up

* Example showing the calculation of all copla methods and comparing to WDRT results

* Simplifications and lanuguage cleanup

* Add statsmodel

* Add testing data files

* In plot envrionmental contors convert x1,x2 to values if a Series is passed

* Docstring typo corrections

* Corrected notebook description typos.

* module and example for short-term extreme distributions

* docstrings for short-term extreme functions

* fixes #140 Speedup surface elevation calculation.

* correction to surface_elevation

* elevation

* minor fixes based on review comments

* add environmental_contours to init

* Remove WDRT functionality

* All WDRT contour functionality can be called from one function

* Rework tests for new contour functions setup and location

* Move all contour example into this file

* Update to work with new structure.

* Remove all commented out wdrt functions from resource

* No changes made. Reverting back.

* Have PCA method use general fit. Adds PCAmethod to fit method but can also accept the PCA dictionary. General Docstring Cleanup

* Update discussion around the use of the copula method.

* Remove copula stand alone notebook

* minor formmating changes

* Remove test bugs created from merge with origin

* Import env contours into resource module and adjust test, examples, ect to function with tthe new structure

* Uncommented tests

* Remove reference to import the env contours module

* fixing minor typo

* Move env contours to _file and adjust package to handle new structure

* Minor formatting cleanup

* Cleanup unsed packages and variables

* intial mler upload

* formalize functions

* add tests and example

* sampling rate to averaging period

* rename MLER example

* working

* merging

* WDRT functions and examples finalized. Missing tests.

* integrate mler into extreme

* fixes tests?

* fix tests

* fix tests

* fix full sea state example?

* test contour samples

* test sample full seastate

* random seed

* test long term extreme

* expand MLER functionality

* test short-term extremes

* fix mler tests

* MLER test error

* mler fix 2

* update formats and asserts

* further cleanup of countours.py for consistency, typos, and pep8

* run tests?

* fix test?

* change lists to np.array so they pass the assert statements

* clean extreme.py for consistency, pep8

* points_per_interval should be int

* typing in examples

* full sea state example: make it easier to follow, add more explanation, and use consistent naming

* contour example: make it easier to follow, add more explanation, and use consistent naming

* Alias ste function and minor formatting.

* naming convention

* rename example

* ste example

* allow weights to be np.array

* allow weights to be np.ndarray

Co-authored-by: ssolson <[email protected]>
Co-authored-by: ssolson <[email protected]>
Co-authored-by: rpauly18 <[email protected]>
Co-authored-by: hivanov-nrel <[email protected]>

* DOLfYN IO (#126)

* input output files
+ testing

* Code update

* Test reformatting

* Testing paths

* dependency switch from h5netcdf to netcdf4

* Code cleanup

* Test import fix

* Minor docstring edits

* Add dolfyn test data

* Test fixes for mhkit

* Removing uneeded test files, improving consistency

* Not sure why these files didn't upload

* Organizational changes and clarifications. Request for additional clarification

* Dolfyn codebase updates

* Dolfyn example notebooks update

* Testing updates

* Update example datafile

* Latest dolfyn v0.13.0 updates

* Name change

* input output files
+ testing

* Code update

* Organizational changes and clarifications. Request for additional clarification

* Dolfyn codebase updates

* fix bug and make faster. Un-hard-code default seed/phase.

* fix tests

* delete commented out tests

* retrigger checks

* Checkpoint push

* New dolfyn data files

* Reorganize dolfyn testing

* pytest install for warnings tests

* Final update for IO

* Remove future updates

* Ensure file compression runs

* Update numpy dependency

* trying numpy v1.22

* changing numpy requirements

* Remake unittest test cases

* Save format options

* Add dolfyn view to notebooks

* Decode remaining binary ad2cp variables

* DOLfYN 1.0.0 dependency

Co-authored-by: jmcvey3 <[email protected]>
Co-authored-by: ssolson <[email protected]>
Co-authored-by: Michelen <[email protected]>
Co-authored-by: jmcvey3 <[email protected]>
Co-authored-by: rpauly18 <[email protected]>

* regenerate WDRT examples (#163)

* updating version number in package

* fixing dolfyn imports from pip

* updating version number for bug fix

* NDBC Metocean data (#152)

* catch extra header in ndbc data

* NDBC cwind example

* update unit catch in request_data

* update gust plot to show more data

* add tests to read cwind with and without units

* move graphics import to ndbc module and fix capitalization

* use resample, add gridlines, rename variables, replace NDBC nans up front

* rename wind_example to metocean_example

* adding "Develop" branch to PR

Co-authored-by: Carlos A. Michelén Ströfer <[email protected]>
Co-authored-by: rpauly18 <[email protected]>
Co-authored-by: hivanov-nrel <[email protected]>
Co-authored-by: jmcvey3 <[email protected]>
Co-authored-by: jmcvey3 <[email protected]>
Co-authored-by: jmcvey3 <[email protected]>
Co-authored-by: rpauly18 <[email protected]>
Co-authored-by: Adam Keester <[email protected]>

* Test Suite Restructure (#174)

* test_wave file to folder with individual feature files

* Move io tests into io folder

* Send plots to a plots folder

* Move resource characterizations plot tests into resource metrics file

* move load tests to folder

* move power tests to folder

* move river tests to folder

* move tidal tests to folder

* move utils tests to folder

* add inits so that tests pick up the tests in subfolders

* Require previous netCDF4 release.

* FIx data directory path

* Fix data directory path

* Fix load data directory path

* Remove relpath call to see if it fixes Windows test suite issues

* Remove relpath from the rest of io tests in wave

* DOLfYN source code (#169)

* Initial push

* Latest bugfixes

* Remove phase-in text

* Update docstrings

* Readability, imports

* Make functions public

* Docstring updates

* Fix test oversight

* Fix docstring

* Missing timestamp fix for classic Nortek

* Docstring updates

* Renaming functions per mhkit standards

* Single array vs binned array functions

* Reorganizing analysis code

* Update invalid orientation matrix warning

* Add config details to dataset attributes

* dolfyn bugfixes

Co-authored-by: jmcvey3 <[email protected]>

* Delft 3D Timestep to Seconds Function (#168)

* fixing file history

* fixing file history

* fixing file history

* made revisions from ssolson review

* changed time_stamp to timestamp

* updated varible names

* updated variable names

* fixed syntax line 63

* umdated variable name

* fixed typos in doc strings

* ssolson review 5-26-2022

* deleted excessive code in get_all_data

* chaged TI to a % from a fraction

* adjusted TI test to be a %

* fixed doc string for TI function

* Docstring adjustments

* updated doc strings

* Make convert_time a hidden func, make 2 functions to access it

* Minor changes to get_lay_data docstring and formatting

* small changes

* remove print from create_points

* example notebook clean up

* fixed merge confilics

* updated after merge

* final developmet barnach merge updates

* deleated space

* Delete test_river.py

* added coverage to test

* updated min and max plot labels

Co-authored-by: Browning <[email protected]>
Co-authored-by: ssolson <[email protected]>

* NetCDF4 (#181)

* Use conda TEST env on Py 3.7, 3.8, 3.9

* Use pip install with Py 3.8 and 3.9.

* Updates for WEC-Sim v5.0 (#185)

* update read_wecsim for WEC-Sim v5.0

* add cable class

* update notebook with results

* add try-except for Morrison (v4.1) vs Morison (v4.2+)

* add cable check and dataset to wave tests

* update cable dataset

* updated variable names

* updated variable names

* updated variable names

* fixed a few docstring typos

* updated s1 to water level

* updated s1 to waterlevel

* updated s1 to waterlevel

* updated s1 to water level

* updated s1 to waterlever

* fixed typo depth to waterdepth

* D3d Tanana Transect Example

* Fix pip install tests (#194)

* Require previous version of NetCDF4.

* Use original pre install for environemnt in pip tests

* Only test pip

* No loading shell PATH

* Do not upgrade h5py

* Set NETCDF to 1.5.8

* pytest and coverage

* yaml syntax fix

* Change need to pip-build

* Control coverage and test via rc files

* Move configuration file to workflows directory

* Move configuration file to workflows directory

* Specify the location of configuration files in coverage/pytest call

* run conda & pip, pass both to coveralls

* conda bash -l {0}

* Add hindcast build which runs serial

* configuration files for hindcast run

* Specify hindcast configuration for hindcast build

* Remove version specification from hindcast calls

* Specify configuration files to include/omit hindcast accordingly

* Change job name

* Fix configuration to hindcast file not test

* Use all OS and py versions in tests

* pandas <=1.5.0

* xarray <=2022.9.0

* Only hindcast

* Clean up package install

* Fixing hypy and h5pyd to previous versions

* Run limited other tests

* No hindcast tests

* remove hindcast comments and coveralls call

* remove py3.8 from pip build

* requirements.txt netCDF <= 1.5.8

* Add function to compute value at a given return period (#193)

* Run CI on push to Develop (#200)

* added optional edge interpolation with nearest

* updated z to water depth

* Dolfyn general updates (#186)

* Initial push

* Latest bugfixes

* Remove phase-in text

* Update docstrings

* Readability, imports

* Make functions public

* Docstring updates

* Fix test oversight

* Fix docstring

* Missing timestamp fix for classic Nortek

* Docstring updates

* Renaming functions per mhkit standards

* Single array vs binned array functions

* Reorganizing analysis code

* Update invalid orientation matrix warning

* Add config details to dataset attributes

* dolfyn bugfixes

* ADV updates
:

* Update compression option for netcdf4

* Remove compression options

* Fix clean function

* Set functions as private

* Move stress functions to ADV dir

* Add bottleneck to reqs

* Minor changes

* Remove old functions

* Code simplification

* Update examples

* Make functions public

* Add bottleneck to dependencies

* Fix notebook

* Bugfix for beam vars

Co-authored-by: jmcvey3 <[email protected]>

* RDI reader, logging, duty cycle motion correction

* Delft3D z calculation (#190)

* updated variable names

* updated variable names

* updated variable names

* fixed a few docstring typos

* updated s1 to water level

* updated s1 to waterlevel

* updated s1 to waterlevel

* updated s1 to water level

* updated s1 to waterlever

* fixed typo depth to waterdepth

* added edges = nearest example

* added edges = nearest option in variable interpolate

* updated z to waterdepth

* added edges= nearest example

Co-authored-by: Browning <[email protected]>

* Directional NDBC  (#197)

* working on directional NDBC

* clean up functions. Write docstrings. Write assert statements. Write tests. Create Tutorial.

* docstring and asserts for plotting function

* add dolfyn, currenly will not run on the branch need jmcvey3 trdi_5beam

* found river bottom and removed data below

* Bug Fix: Averaging histogram bin and wave energy (#205)

* Fix averaging bug
* Add outline to bin counts text for better contrast
* Update plotting function and plot in example notebook

* Fix: update variable name to remove reference before assignment error (#208)

* update wave.contours.samples_contour to not get variable referenced before assignment error

Co-authored-by: Graham Penrose <[email protected]>

* HSDS (#211)

Adds hindcast tests back into the test suite. The NREL HSDS API issues were resolved by creating multiple calls to the API for direction wave spectrum requests. Additionally, an exponential back-off time was implemented to retry calls with an increased wait time between calls.

Co-authored-by: Adam Keester <[email protected]>

* Provide function to convert from Te to Tp using ITTC approximation (#210)

* Provide function to convert from Te to Tp using ITTC approximation

* Apply suggestions from code review

Co-authored-by: Adam Keester <[email protected]>

* Updates

* Force float32 datatype

* added downsampelind comparison and tried contourf

* D3D tanana data

* tanana transect 2

* tanana transect 3

* Docstring formatting

* Metocean module - WIND Toolkit (#187)

* initial script

* update wind_toolkit with 4 regions and 1-hr or 5-min data

* update parameters of wind_toolkit functions

* compare NDBC and WIND metocean data

* fix typo in wpto hindcast example

* finish metocean example and add results

* add wind_toolkit to wave/io/__init__.py

* update WIND Toolkit parameter list

* initial test structure for WIND toolkit

* finish metocean example

* add function to plot each region

* wind toolkit tests and test data

* add tests for misc wind_toolkit MHKiT functions and cases

* fix wind toolkit tests

* add elevation_to_string utility function

* misc cleanup

* clarify available parameters

* add users lat_lon to plot_region visualization

* update example with new functions

* add numpy dependency back in

* Ingnore the new hindcast folder

* Include only the new hindcast folder

* Move hindcast tests to hindcast folder

* Specify exclusion of hindcast from standard coverage

* update hindcast coverage

* remove unnecessary header

* move hindcast and wind_toolkit to wave/io/hindcast

* update .coveragerc files

* update paths for new wave.io.hindcast directory

Co-authored-by: ssolson <[email protected]>

* Change 'default' docstring default

* Remove old comments

* updated code to match Energies paper

* Review

* Boat transect image

* updated variable names

* Dolfyn updates (#212)

* RDI reader, logging, duty cycle motion correction

* Updates

* Force float32 datatype

* Docstring formatting

* Change 'default' docstring default

* Remove old comments

* updated variable names

* updated variable names added to discriptions

* Clean up and suggestions

* added to the examples

* TRTS study edits

* code and discription updates

* Edits and TODOs

* moved files, updated discriptions

* readding Delft3D_example notebook

* added USGS discharge

* updated doc strings

* example updates and move data files

* updated doc strings and Error equations

* updated doc strings

* pulled down development branch

* updated figure visibility

* updated figure at L2 equation

* restor old version

* updated L2 eqation and intro fig

* updated L2 eqation and intro fig

* updated L2 equation

* pulled in Develope branch

* updated figure formate

---------

Co-authored-by: ssolson <[email protected]>
Co-authored-by: ssolson <[email protected]>
Co-authored-by: Carlos A. Michelén Ströfer <[email protected]>
Co-authored-by: rpauly18 <[email protected]>
Co-authored-by: hivanov-nrel <[email protected]>
Co-authored-by: jmcvey3 <[email protected]>
Co-authored-by: jmcvey3 <[email protected]>
Co-authored-by: jmcvey3 <[email protected]>
Co-authored-by: rpauly18 <[email protected]>
Co-authored-by: Adam Keester <[email protected]>
Co-authored-by: Browning <[email protected]>
Co-authored-by: Mark Bruggemann <[email protected]>
Co-authored-by: Graham Penrose <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Clean Up Improve code consistency and readability

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants