fix seas anomaly

jl-pkgs · Jul 23, 2023 · 3ba98c2 · 3ba98c2
1 parent 1ce6e57
commit 3ba98c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/Climate/anomaly.jl b/src/Climate/anomaly.jl
@@ -93,14 +93,13 @@ function cal_anomaly_quantile(
 ) where {T<:Real}
 
   kw = (; probs, use_mov, na_rm, parallel, options...)
-  # TODO: 多个阈值，需要再嵌套for循环了
   if method == "base"
     mTRS = cal_mTRS_base(A, dates; p1, p2, kw...) |> squeeze_tail
-    anom = _cal_anomaly(A, mTRS, dates; option=1)
+    anom = _cal_anomaly(A, mTRS, dates)
   elseif method == "season"
     mTRS = cal_mTRS_base(A, dates; p1, p2, kw...) |> squeeze_tail
     T_wl = cal_warming_level(A, dates; p1, p2)
-    anom = _cal_anomaly(A, mTRS, dates; option=2, T_wl)
+    anom = _cal_anomaly(A, mTRS, dates; T_wl)
   elseif method == "full"
     TRS_full = cal_mTRS_full(A, dates; kw...) |> squeeze_tail
     anom = fun.(A, TRS_full)

diff --git a/src/Climate/base.jl b/src/Climate/base.jl
@@ -2,9 +2,9 @@ using Dates
 using Printf: @sprintf
 
 # DateType = Union{Date,DateTime,AbstractCFDateTime,Nothing}
-_gte(x::T, trs::T, wl::T=T(0)) where {T<:Real} = x >= trs + wl
-_gt(x::T, trs::T, wl::T=T(0)) where {T<:Real} = x > trs + wl
-_exceed(x::T, trs::T, wl::T=T(0)) where {T<:Real} = x - trs + wl
+_gte(x::T, trs::T, wl::T=T(0)) where {T<:Real} = x >= (trs + wl)
+_gt(x::T, trs::T, wl::T=T(0)) where {T<:Real} = x > (trs + wl)
+_exceed(x::T, trs::T, wl::T=T(0)) where {T<:Real} = x - (trs + wl)
 
 
 # format_md(date) = @sprintf("%02d-%02d", month(date), day(date))