Skip to content

Commit

Permalink
Merge Master into Develop (#176)
Browse files Browse the repository at this point in the history
* 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 <ssolson@sandia.gov>
Co-authored-by: ssolson <ssolson@users.noreply.github.com>
Co-authored-by: rpauly18 <rpauly@nrel.gov>
Co-authored-by: hivanov-nrel <53838851+hivanov-nrel@users.noreply.github.com>

* 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 <james13rmh@gmail.com>
Co-authored-by: ssolson <ssolson@sandia.gov>
Co-authored-by: Michelen <cmichel@sandia.gov>
Co-authored-by: jmcvey3 <jmcvey3@users.noreply.github.com>
Co-authored-by: rpauly18 <rpauly@nrel.gov>

* 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

* Require previous version of NetCDF4.

Co-authored-by: Carlos A. Michelén Ströfer <cmichel@sandia.gov>
Co-authored-by: rpauly18 <rpauly@nrel.gov>
Co-authored-by: hivanov-nrel <53838851+hivanov-nrel@users.noreply.github.com>
Co-authored-by: jmcvey3 <53623232+jmcvey3@users.noreply.github.com>
Co-authored-by: jmcvey3 <james13rmh@gmail.com>
Co-authored-by: jmcvey3 <jmcvey3@users.noreply.github.com>
Co-authored-by: rpauly18 <50752018+rpauly18@users.noreply.github.com>
Co-authored-by: Adam Keester <72414466+akeeste@users.noreply.github.com>
  • Loading branch information
9 people committed Jul 12, 2022
1 parent f60d775 commit 5c4f7dd
Show file tree
Hide file tree
Showing 8 changed files with 33,895 additions and 14 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
Expand Up @@ -4,7 +4,9 @@ on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
branches:
- master
- Develop

jobs:
build:
Expand Down
4,321 changes: 4,321 additions & 0 deletions examples/data/wave/42a01c2003.txt

Large diffs are not rendered by default.

0 comments on commit 5c4f7dd

Please sign in to comment.