Skip to content

Commit aee7404

Browse files
Merge #37
37: make Dierckx Spline1D return type stable r=szy21 a=trontrytel Co-authored-by: Anna Jaruga <ajaruga@caltech.edu>
2 parents e2df773 + ec47bc0 commit aee7404

File tree

10 files changed

+19
-10
lines changed

10 files changed

+19
-10
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "AtmosphericProfilesLibrary"
22
uuid = "86bc3604-9858-485a-bdbe-831ec50de11d"
33
authors = ["Climate Modeling Alliance"]
4-
version = "0.1.1"
4+
version = "0.1.2"
55

66
[deps]
77
Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94"

src/profiles/ARM_SGP.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ function ARM_SGP_tke_prescribed(::Type{FT}) where {FT}
4949
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
5050
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
5151
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
52-
return Dierckx.Spline1D(z_in, tke_in; k = 1)
52+
not_type_stable_spline = Dierckx.Spline1D(z_in, tke_in; k = 1)
53+
return x -> FT(not_type_stable_spline(x))
5354
end
5455

5556
""" [Brown2002](@cite) """

src/profiles/Bomex.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ function Bomex_tke_prescribed(::Type{FT}) where {FT}
4545
0.1468, 0.1470, 0.1458, 0.1423, 0.1351, 0.1224, 0.1033, 0.0793, 0.0542, 0.0322,
4646
0.0162, 0.0068, 0.0024, 0.0007, 0.0001, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
4747
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
48-
return Dierckx.Spline1D(z_in, tke_in; k = 1)
48+
not_type_stable_spline = Dierckx.Spline1D(z_in, tke_in; k = 1)
49+
return x -> FT(not_type_stable_spline(x))
4950
end
5051

5152
# Geostrophic velocity profiles

src/profiles/Dycoms_RF01.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ function Dycoms_RF01_tke_prescribed(::Type{FT}) where {FT}
3030
775.0, 825.0, 875.0, 925.0, 975.0, 1025.0, 1075.0, 1125.0, 1175.0, 1225.0, 1275.0, 1325.0, 1375.0, 1425.0, 1475.0]
3131
tke_in = FT[0.2726, 0.5479, 0.6597, 0.7079, 0.7285, 0.7343, 0.7319, 0.7252, 0.7166, 0.7064, 0.6887, 0.6317,
3232
0.6362, 0.6266, 0.5832, 0.4633, 0.0504, 0.0001, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
33-
return Dierckx.Spline1D(z_in, tke_in; k = 1)
33+
not_type_stable_spline = Dierckx.Spline1D(z_in, tke_in; k = 1)
34+
return x -> FT(not_type_stable_spline(x))
3435
end
3536

src/profiles/GABLS.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ GABLS_tke(::Type{FT}) where {FT} =
2626
function GABLS_tke_prescribed(::Type{FT}) where {FT}
2727
z_in = FT[25.0, 75.0, 125.0, 175.0, 225.0, 275.0, 325.0, 375.0]
2828
tke_in = FT[0.4662, 0.3873, 0.2777, 0.0277, 0.0003, 5.89e-8, 0.0, 0.0]
29-
return Dierckx.Spline1D(z_in, tke_in; k = 1)
29+
not_type_stable_spline = Dierckx.Spline1D(z_in, tke_in; k = 1)
30+
return x -> FT(not_type_stable_spline(x))
3031
end
3132

3233
""" :( """

src/profiles/LifeCycleTan2018.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ function LifeCycleTan2018_tke_prescribed(::Type{FT}) where {FT}
5757
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
5858
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
5959
0.0, 0.0, 0.0]
60-
return Dierckx.Spline1D(z_in, tke_in; k = 1)
60+
not_type_stable_spline = Dierckx.Spline1D(z_in, tke_in; k = 1)
61+
return x -> FT(not_type_stable_spline(x))
6162
end
6263

6364
# Large-scale cooling

src/profiles/Nieuwstadt.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,6 @@ function Nieuwstadt_tke_prescribed(::Type{FT}) where {FT}
5151
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
5252
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
5353
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
54-
return Dierckx.Spline1D(z_in, tke_in; k = 1)
54+
not_type_stable_spline = Dierckx.Spline1D(z_in, tke_in; k = 1)
55+
return x -> FT(not_type_stable_spline(x))
5556
end

src/profiles/Rico.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,6 @@ function Rico_tke_prescribed(::Type{FT}) where {FT}
7878
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
7979
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
8080
0.0, 0.0, 0.0, 0.0]
81-
return Dierckx.Spline1D(z_in, tke_in; k = 1)
81+
not_type_stable_spline = Dierckx.Spline1D(z_in, tke_in; k = 1)
82+
return x -> FT(not_type_stable_spline(x))
8283
end

src/profiles/Soares.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,6 @@ function Soares_tke_prescribed(::Type{FT}) where {FT}
4646
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
4747
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
4848
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
49-
return Dierckx.Spline1D(z_in, tke_in; k = 1)
49+
not_type_stable_spline = Dierckx.Spline1D(z_in, tke_in; k = 1)
50+
return x -> FT(not_type_stable_spline(x))
5051
end

src/profiles/TRMM_LBA.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ function TRMM_LBA_tke_prescribed(::Type{FT}) where {FT}
103103
1.7938 , 1.56451, 1.37531, 1.17515, 0.96797, 0.61262, 0.26423,
104104
0.14929, 0.07465, 0.00635, 0. , 0. , 0. , 0. ,
105105
0. , 0. , 0. , 0. , 0. ]
106-
return Dierckx.Spline1D(z_in, tke_in; k = 1)
106+
not_type_stable_spline = Dierckx.Spline1D(z_in, tke_in; k = 1)
107+
return x -> FT(not_type_stable_spline(x))
107108
end
108109

109110

0 commit comments

Comments
 (0)