Skip to content

Commit 252fbb6

Browse files
authored
Merge pull request PecanProject#3932 from shreyannandanwar/fix/run-input-typo-clean
fix: correct run$input → run$inputs typo across 4 files
2 parents 9aef980 + 437d51c commit 252fbb6

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

base/workflow/R/do_conversions.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ do_conversions <- function(settings, overwrite.met = FALSE, overwrite.fia = FALS
2828
next
2929
}
3030

31-
input.tag <- names(settings$run$input)[i]
31+
input.tag <- names(settings$run$inputs)[i]
3232
PEcAn.logger::logger.info("PROCESSING: ",input.tag)
3333

3434
# Check for existing file paths , skips if the file exists

modules/data.land/R/soil_process.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ soil_process <- function(settings, input, dbfiles, overwrite = FALSE, run.local
6262

6363
if (length(newfile) == 0) {
6464
# No files exist yet — extract from gSSURGO
65-
radius <- ifelse(is.null(settings$run$input$soil$radius), 100,
66-
as.numeric(settings$run$input$soil$radius))
67-
grid_size <- max(3, ifelse(is.null(settings$run$input$soil$grid_size), 3,
68-
as.numeric(settings$run$input$soil$grid_size)))
65+
radius <- ifelse(is.null(settings$run$inputs$soil$radius), 100,
66+
as.numeric(settings$run$inputs$soil$radius))
67+
grid_size <- max(3, ifelse(is.null(settings$run$inputs$soil$grid_size), 3,
68+
as.numeric(settings$run$inputs$soil$grid_size)))
6969

7070
grid_extent <- radius * sqrt(pi)
7171
grid_spacing <- grid_extent / (grid_size - 1)

scripts/workflow.bm.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ for (i in seq_along(settings$run$inputs)) {
100100
next
101101
}
102102

103-
input.tag <- names(settings$run$input)[i]
103+
input.tag <- names(settings$run$inputs)[i]
104104

105105
# fia database
106106
if ((input["input"] == "fia") && (status.check("FIA2ED") == 0)) {

scripts/workflow.pda.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ if (length(which(commandArgs() == "--continue")) == 0) {
6363
next
6464
}
6565

66-
input.tag <- names(settings$run$input)[i]
66+
input.tag <- names(settings$run$inputs)[i]
6767

6868
# fia database
6969
if (input["input"] == "fia") {

0 commit comments

Comments
 (0)