Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
bd2586b
prototype enviconmental contours module
efvik Feb 27, 2025
842da5c
improvements/options to scatter plot
efvik Feb 28, 2025
01adf60
new scatter table procedure which hopefully is more stable
efvik Feb 28, 2025
dee41ff
Improved bin logic for negative values.
efvik Feb 28, 2025
efc8534
removed print statement
efvik Feb 28, 2025
9bcf589
put new environmental contours in separate module
efvik Mar 3, 2025
a2a58fd
test fix
efvik Mar 3, 2025
6e87906
Options to scatter plot
efvik Mar 20, 2025
a2ac8cb
Merge remote-tracking branch 'origin/main' into dev
efvik Mar 20, 2025
d2dc86a
moved old contour plotting script
efvik Mar 21, 2025
360f8e6
imports existing virocon distributions and adds lonowe to it
efvik Mar 21, 2025
2fe40bb
Implements JointProbabilityModel, a convenient wrapper for the GHM of…
efvik Mar 21, 2025
71b47c5
Function for visualizing a PDF as a scatter diagram
efvik Mar 21, 2025
88841f2
Predefined models, including LoNoWe and windsea model (WIP)
efvik Mar 21, 2025
af29750
renamed file
efvik Mar 24, 2025
6fb3f3f
Added __init__
efvik Mar 24, 2025
438ca63
Merge remote-tracking branch 'origin/main' into dev
efvik Mar 24, 2025
c74c364
Merge remote-tracking branch 'origin/main' into dev
efvik Apr 1, 2025
d330688
Merge remote-tracking branch 'origin/main' into dev
efvik Apr 1, 2025
322c18c
Fix wrong module reference.
efvik Apr 1, 2025
ab6be26
Added check to remove NaN rows in calculate_scatter.
efvik Apr 1, 2025
abd0141
Fix erroneous import
efvik Apr 4, 2025
c4b541e
Improve y-axis logarithmic approach to 1.
efvik Apr 4, 2025
83cb2e1
Merge remote-tracking branch 'origin/main' into dev
efvik Apr 7, 2025
7d3e7d0
Update corresponding to the new virocon version.
efvik Apr 22, 2025
8087dcb
Bugfix on return period plots.
efvik Apr 22, 2025
7d35734
Add functionally oriented plots for the joint model.
efvik Apr 22, 2025
6b1f31e
Merge remote-tracking branch 'origin/main' into dev
efvik Apr 22, 2025
60dfb98
Better DNVGL dependency fit
efvik Apr 24, 2025
0db7c2a
multi joint distribution fix
efvik Apr 26, 2025
382c799
add xlim and ylim as parameters
efvik Apr 26, 2025
046a78f
pyextremes helper functions
efvik Apr 26, 2025
697c298
Nearly all plotting functions now implemented, with a dynamic legend.
efvik Apr 26, 2025
e479425
Fixed bad reference
efvik Apr 26, 2025
5abddb5
Moved function into main class.
efvik Apr 26, 2025
6cd6eaf
Added function for plotting dependent percentiles, such as Tp percent…
efvik Apr 29, 2025
5fa459c
Started work on 3D joint models.
efvik Apr 29, 2025
c83f1a1
New version of table_monthly_percentile, using pandas.
efvik Apr 29, 2025
1977754
Added yearly stats to monthly directional stats.
efvik Apr 29, 2025
9206997
Add csv output option for monthly directional tables.
efvik Apr 29, 2025
3b7e002
Changes (api consolidation): dataframe now required to fit, data is s…
efvik Apr 29, 2025
5139493
Added 3D environmental model from Li et. al.
efvik May 4, 2025
ffe2adb
Renamed parameter preset -> model. Implemented threshold (yearly max …
efvik May 4, 2025
760bd2b
Temporarily changed isorm and iform contours, along with nsphere, to …
efvik May 4, 2025
0658df9
Contour features: gridded 3D contour, sorting contour, general get_co…
efvik May 7, 2025
8797f80
3D contours and plotting.
efvik May 7, 2025
f938e1b
Tz -> Tp
efvik May 8, 2025
29cca22
Implemented isodensity contour slices based on 3D model
efvik May 8, 2025
1658ab6
Isodensity contour slices can now be defined indirectly via return va…
efvik May 8, 2025
6b46ba1
Function to plot 3D isodensity contour surface from several 2D isoden…
efvik May 9, 2025
31c6d0f
Add intervals class
efvik May 19, 2025
656dc15
Add virocon licence to contours file.
efvik May 19, 2025
7adf387
small cleanup
efvik May 19, 2025
9451878
Various small fixes/improvements
efvik May 19, 2025
ec9895f
Added a lot of predefined models, will have to be standardized later.
efvik May 19, 2025
fb5fd3c
bugfix
efvik May 19, 2025
8d3db6d
Some updates to predefined models.
efvik Jun 4, 2025
14b9c6a
Cleaned up joint models
efvik Jun 30, 2025
fed36b6
Merge remote-tracking branch 'origin/main' into dev
efvik Jun 30, 2025
3f4a742
Added joint model tests
efvik Jun 30, 2025
ec842e7
Improved scatter diagram
efvik Jul 17, 2025
0c36fb0
Small fix
efvik Jul 18, 2025
bf3b95c
Small update
efvik Jul 18, 2025
31ed14c
Generalization to negative bin values
efvik Jul 18, 2025
c063cac
Merge remote-tracking branch 'origin/main' into dev
efvik Jul 18, 2025
ab34133
Fixed monthly tables test
efvik Jul 18, 2025
8191207
Added dependency
efvik Jul 18, 2025
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
venv/
build/
*.egg-info/
.vscode/
.vscode/
*.eggs
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ dependencies:
- netcdf4
- pydap
- setuptools

- virocon
38 changes: 38 additions & 0 deletions metocean_stats/CMA/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
"""
Module for the conditional modelling approach, which builds on virocon:
https://github.com/virocon-organization/virocon
Virocon is used under the following licence:

-----------------------------------------------------------------------------

MIT License

Copyright (c) 2017-2021 virocon developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

------------------------------------------------------------------------------

"""

from .jointmodel import JointProbabilityModel

__all__ = [
"JointProbabilityModel"
]
Loading
Loading