Skip to content

Commit

Permalink
Merge pull request #33 from jbisits/joey-adddistributionfunctions
Browse files Browse the repository at this point in the history
Add histogram fitting for `Raster` data structures and break code into submodules
  • Loading branch information
jbisits authored Apr 10, 2023
2 parents 66a034f + 8a9f708 commit 57685b6
Show file tree
Hide file tree
Showing 7 changed files with 575 additions and 15 deletions.
1 change: 0 additions & 1 deletion .github/workflows/CI.yml
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
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
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
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

0 comments on commit 57685b6

Please sign in to comment.