Skip to content

Commit 76a5702

Browse files
committed
Add SOPAC, SOIND, and SOATL functions
1 parent 8899fbf commit 76a5702

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "OceanBasins"
22
uuid = "d1bb7020-b2be-4340-9d18-d24ca645bddb"
33
authors = ["Benoit Pasquier <briochemc@gmail.com>"]
4-
version = "0.1.3"
4+
version = "0.1.4"
55

66
[deps]
77
DataDeps = "124859b0-ceae-595e-8997-d05f6a7a8dfe"

src/OceanBasins.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,13 @@ isantarctic(P, oceans) = P.lat ≤ -40
5757
isatlantic2(P, oceans) = isatlantic(P, oceans) && !isantarctic(P, oceans)
5858
ispacific2(P, oceans) = ispacific(P, oceans) && !isantarctic(P, oceans)
5959
isindian2(P, oceans) = isindian(P, oceans) && !isantarctic(P, oceans)
60+
convert_65S_to_90S(P::Point2D{T}) where T = Point2D(P.lat < -65 ? T(-65) : P.lat, P.lon)
61+
isSOatlantic(P, oceans) = isatlantic(convert_65S_to_90S(P), oceans) && isantarctic(P, oceans)
62+
isSOpacific(P, oceans) = ispacific(convert_65S_to_90S(P), oceans) && isantarctic(P, oceans)
63+
isSOindian(P, oceans) = isindian(convert_65S_to_90S(P), oceans) && isantarctic(P, oceans)
6064
isindonesian(P, oceans) = foldl(|, P oceans[i] for i in 11:37) # Indo throughflow (TODO fix name?)
6165
for ocn in (:pacific, :atlantic, :indian, :arctic, :mediterranean, :antarctic,
62-
:pacific2, :atlantic2, :indian2, :indonesian)
66+
:pacific2, :atlantic2, :indian2, :indonesian, :SOatlantic, :SOpacific, :SOindian)
6367
f = Symbol(:is, ocn)
6468
@eval begin
6569
"""

test/runtests.jl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ const OCEANS = oceanpolygons()
88
@test isarctic(89, 0, OCEANS)
99
@test isatlantic(0, -30, OCEANS)
1010
@test isindian(0, 90, OCEANS)
11+
@test ispacific2(0, -160, OCEANS)
12+
@test isatlantic2(0, -30, OCEANS)
13+
@test isindian2(0, 90, OCEANS)
14+
@test isSOpacific(-80, -160, OCEANS)
15+
@test isSOatlantic(-80, -30, OCEANS)
16+
@test isSOindian(-80, 90, OCEANS)
1117
@test isantarctic(-40, 0, OCEANS)
1218
@test ismediterranean(31, 15, OCEANS)
1319
@test isindonesian(0, 120, OCEANS)

0 commit comments

Comments
 (0)