Fix bugs on index of stap with/out include and variable

Author: Rafnuss

R/edge_add_wind.R

@@ -106,6 +106,11 @@ edge_add_wind <- function(
 
   # Convert consecutive stationary periods into one or several flight segments.
   flight <- stap2flight(graph$stap, format = "list")
+  stap_include <- if ("include" %in% names(graph$stap)) {
+    graph$stap$stap_id[graph$stap$include]
+  } else {
+    graph$stap$stap_id
+  }
 
   # Convert edge ids to array indices and group edges by source stationary period.
   edge_info <- edge_add_wind_prepare_edges(edge_s, edge_t, g, graph$stap)
@@ -142,11 +147,13 @@ edge_add_wind <- function(
     # Extract the flight information from the current stap to the next one considered in the graph.
     # It can be the next, or if some stap are skipped at construction, it can contains multiples
     # flights
-    stap_id <- edge_stap[i_stap]
-    fl_s <- flight[[stap_id]]
+    # Graph layers are compressed to included staps; flight names use original stap_id.
+    stap_layer <- as.integer(edge_stap[i_stap])
+    stap_id <- stap_include[stap_layer]
+    fl_s <- flight[[as.character(stap_id)]]
 
     # Determine the id of edges of the graph corresponding to this/these flight(s).
-    st_id <- list_st_id[[stap_id]]
+    st_id <- list_st_id[[edge_stap[i_stap]]]
     if (length(st_id) == 0) {
       next
     }

R/graph_add_wind.R

@@ -183,6 +183,11 @@ add_wind_graph_edge <- function(
   }
   g <- map_expand(graph$param$tag_set_map$extent, graph$param$tag_set_map$scale)
   flight <- stap2flight(graph$stap, format = "list")
+  stap_include <- if ("include" %in% names(graph$stap)) {
+    graph$stap$stap_id[graph$stap$include]
+  } else {
+    graph$stap$stap_id
+  }
   n_grid <- prod(g$dim)
   edge_s0 <- graph$s - 1
   edge_t0 <- graph$t - 1
@@ -220,9 +225,11 @@ add_wind_graph_edge <- function(
   n_edge_done <- 0L
   for (i_stap in seq_along(edge_stap)) {
     # Work on one source stationary period at a time so the output can be written into ws[st_id].
-    stap_id <- edge_stap[i_stap]
-    fl_s <- flight[[stap_id]]
-    st_id <- list_st_id[[stap_id]]
+    # Graph layers are compressed to included staps; flight names use original stap_id.
+    stap_layer <- as.integer(edge_stap[i_stap])
+    stap_id <- stap_include[stap_layer]
+    fl_s <- flight[[as.character(stap_id)]]
+    st_id <- list_st_id[[edge_stap[i_stap]]]
     if (length(st_id) == 0) {
       next
     }

R/param_create.R

@@ -104,7 +104,6 @@ param_create <- function(id, default = FALSE, ...) {
       graph_add_wind = list(
         thr_as = formals(graph_add_wind)$thr_as,
         file = formals(edge_add_wind)$file,
-        variable = formals(edge_add_wind)$variable,
         rounding_interval = formals(edge_add_wind)$rounding_interval,
         interp_spatial_linear = formals(edge_add_wind)$interp_spatial_linear
       ),