From b76959ba30bf1bc201dd08e38111c770218aa6e2 Mon Sep 17 00:00:00 2001
From: nperez <nperez@bscearth372.int.bsc.es>
Date: Fri, 22 Jan 2021 11:56:58 +0100
Subject: [PATCH] Fixing usecases 1-12 and 2-1

---
 inst/doc/usecase/ex1_12_rotated_coordinates.R | 8 ++++----
 inst/doc/usecase/ex2_1_timedim.R              | 8 +++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/inst/doc/usecase/ex1_12_rotated_coordinates.R b/inst/doc/usecase/ex1_12_rotated_coordinates.R
index 3da4b79..f657a70 100644
--- a/inst/doc/usecase/ex1_12_rotated_coordinates.R
+++ b/inst/doc/usecase/ex1_12_rotated_coordinates.R
@@ -5,11 +5,11 @@
 #-------------------------------
 library(startR)
 
-obs_path <- '/esarchive/exp/monarch-dustclim/3hourly/$var$/$var$_$date$03_av_an.nc'
+path <- '/esarchive/oper/thredds-dust/monarch-dustclim/3hourly/$var$-av_an/$var$_$date$03_av_an.nc'
 
 date <- c('20131229', '20131230')
 # two temporal dimensions: one for days and another four hours
-data_split <- Start(dataset = obs_path,
+data_split <- Start(dataset = path,
               var = 'od550du',
               lev = 'all',
               date = date,
@@ -21,7 +21,7 @@ data_split <- Start(dataset = obs_path,
                                  lat = NULL, lon = NULL),
               retrieve = TRUE, num_procs = 1)
 # one temporal dimension
-data <- Start(dataset = obs_path,
+data <- Start(dataset = path,
               var = 'od550du',
               lev = 'all',
               date = date,
@@ -48,7 +48,7 @@ attributes(data)$Variables$common$time
 
 
 # PLOT:
-map <- data[1,1,1,1,1,,] # Time-step 1
+map <- data[1,1,1,1,,] # Time-step 1
 library(sf)
 library(ggplot2)
 map <- data.frame(rlat = rep(rlat, length(rlon)),
diff --git a/inst/doc/usecase/ex2_1_timedim.R b/inst/doc/usecase/ex2_1_timedim.R
index f06b766..f8253c8 100644
--- a/inst/doc/usecase/ex2_1_timedim.R
+++ b/inst/doc/usecase/ex2_1_timedim.R
@@ -13,16 +13,14 @@ library(startR)
                 return_vars = list(latitude = 'dat', longitude = 'dat', time = 'sdate'),
                 retrieve = FALSE)
   
-  library(multiApply)
   fun_spring <- function(x) {
-      source("/esarchive/scratch/nperez/Season_v2.R")
-      y <- Season_v2(x,  monini = 1, moninf = 3, monsup = 5)
+      y <- s2dv::Season(x,  time_dim = 'time', monini = 1, moninf = 3, monsup = 5)
       return(y)
   }
   
   step1 <- Step(fun = fun_spring,
-               target_dims = c('time'),
-               output_dims = c('time'))
+               target_dims = c('var', 'time'),
+               output_dims = c('var', 'time'))
   
   wf1 <- AddStep(data, step1)
   
-- 
GitLab