minor fix in pr_ts2eir_history

dd-harp · Jan 29, 2025 · 2885ee2 · 2885ee2
1 parent 9acc07c
commit 2885ee2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ docs/reference/ar_compare.html
 *.html
 /docs/articles
 /docs
+/vignettes/Trend_files
diff --git a/R/pr2eir_history.R b/R/pr2eir_history.R
@@ -28,7 +28,7 @@ pr_ts2eir_history <- function(pr_ts, times, model){
 
   # First pass: fit the inter-annual variability
   N = diff(range(round(times/365)))+1
-  fit_splinef(N, obs_pr, tt, model) -> Ts1
+  fit_splinef(N, pr_ts, times, model) -> Ts1
 
   # Second pass: adjust eir
   fac = mean(Ts1$yy)
@@ -43,7 +43,7 @@ pr_ts2eir_history <- function(pr_ts, times, model){
   model$EIRpar$F_season <- make_function(Fs2)
 
   # Second pass: refit interannual variability
-  fit_splinef(N, obs_pr, tt, model) -> Ts2
+  fit_splinef(N, pr_ts, times, model) -> Ts2
   model$EIRpar$F_trend <- make_function(Ts2)
   model$fits <- list()
   model$fits$par_season <- Fs2

diff --git a/docs/articles/Scaling.html b/docs/articles/Scaling.html
diff --git a/docs/sitemap.xml b/docs/sitemap.xml
@@ -24,6 +24,9 @@
   <url>
     <loc>https://dd-harp.github.io/ramp.xds/articles/Seasonality.html</loc>
   </url>
+  <url>
+    <loc>https://dd-harp.github.io/ramp.xds/articles/Trend.html</loc>
+  </url>
   <url>
     <loc>https://dd-harp.github.io/ramp.xds/articles/index.html</loc>
   </url>
@@ -90,6 +93,9 @@
   <url>
     <loc>https://dd-harp.github.io/ramp.xds/reference/fit_sin_season.html</loc>
   </url>
+  <url>
+    <loc>https://dd-harp.github.io/ramp.xds/reference/fit_splinef.html</loc>
+  </url>
   <url>
     <loc>https://dd-harp.github.io/ramp.xds/reference/hello.html</loc>
   </url>
@@ -126,6 +132,9 @@
   <url>
     <loc>https://dd-harp.github.io/ramp.xds/reference/sse_season.html</loc>
   </url>
+  <url>
+    <loc>https://dd-harp.github.io/ramp.xds/reference/sse_splinef.html</loc>
+  </url>
   <url>
     <loc>https://dd-harp.github.io/ramp.xds/reference/update_by_ar.html</loc>
   </url>

diff --git a/vignettes/Trend.R b/vignettes/Trend.R
@@ -1,7 +1,6 @@
 ## -----------------------------------------------------------------------------
 library(ramp.xds)
 library(ramp.work)
-devtools::load_all()
 
 ## -----------------------------------------------------------------------------
 tt <- round(seq(0, 2500, by = 365/12))
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,3 +13,4 @@ docs/reference/ar_compare.html @@
     *.html
     /docs/articles
     /docs
+    /vignettes/Trend_files