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.

Sign up for GitHub

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

Add histogram fitting for Raster data structures and break code into submodules #33

Merged
merged 9 commits into from
Apr 10, 2023
Merged

Add histogram fitting for Raster data structures and break code into submodules #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c545ab0
Add histogram fitting and weight functions
jbisits Apr 6, 2023
f4d432a
Remove checker
jbisits Apr 6, 2023
7a827bb
Histograms + weights and tests
jbisits Apr 7, 2023
605ee35
julia test version cover all functions
jbisits Apr 7, 2023
5a10e32
Update Project.toml
jbisits Apr 7, 2023
3ba7b4c
Change to types for the Histograms
jbisits Apr 9, 2023
5c73c7c
Tests for all `AbstractRasterHistogram`s
jbisits Apr 10, 2023
72e10b2
Change to modules
jbisits Apr 10, 2023
8a9f708
Add Linear Algebra and clean a little
jbisits Apr 10, 2023
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
1 change: 0 additions & 1 deletion .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
matrix:
version:
- '1.8'
- 'nightly'
os:
- ubuntu-latest
arch:
Expand Down
10 changes: 8 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,19 @@ authors = ["Josef I. Bisits <[email protected]>"]
version = "0.2.2"

[deps]
DimensionalData = "0703355e-b756-11e9-17c0-8b28908087d0"
GibbsSeaWater = "9a22fb26-0b63-4589-b28e-8f9d0b5c3d05"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
MakieCore = "20f20a25-4f0e-4fdf-b5d1-57303727442b"
Rasters = "a3a2b9e3-a471-40c9-b274-f788e487c689"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"

[compat]
julia = "1.6"
Rasters = "^0.5.0"
DimensionalData = "=0.24.7"
GibbsSeaWater = "^0.1.2"
Rasters = "^0.5.0"
julia = "1.6"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
11 changes: 5 additions & 6 deletions src/OceanRasterConversions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
module OceanRasterConversions

using Rasters, GibbsSeaWater
using Reexport

export
convert_ocean_vars,
depth_to_pressure, Sₚ_to_Sₐ, θ_to_Θ,
get_ρ, get_σₚ, get_α, get_β
include("oceanvariableconversions.jl")
include("oceanvariabledistributions.jl")

include("oceanconversions.jl")
@reexport using OceanRasterConversions.OceanVariableConversions
@reexport using OceanRasterConversions.RasterHistograms

end #module
11 changes: 11 additions & 0 deletions src/oceanconversions.jl → src/oceanvariableconversions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
module OceanVariableConversions

using Rasters, GibbsSeaWater

export
convert_ocean_vars,
depth_to_pressure, Sₚ_to_Sₐ, θ_to_Θ,
get_ρ, get_σₚ, get_α, get_β

"""
function convert_ocean_vars(raster::RasterStack, var_names::NamedTuple;
ref_pressure = nothing,
Expand Down Expand Up @@ -340,3 +349,5 @@ function get_dims(raster::Raster)
return rs_dims

end

end #module
Loading