Skip to content

Commit

Permalink
Fixes 'ExtractSkyDataFromNOAAClimateAtlas_USA'
Browse files Browse the repository at this point in the history
- extractions were looping over months but assigned to all months at
once; thus, values for December were copied across all months
- closes #12


Former-commit-id: e5c620a8b3a9a9e860b7f74c0732f00825f23da5 [formerly 8913024e2f5e8649ac3f81bd49ea5cafbaaba841]
Former-commit-id: c3db2fe
  • Loading branch information
dschlaep committed Aug 18, 2016
1 parent bcadb1a commit d633b2c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions 2_SWSF_p3of4_ExternalDataExtractions_v51.R
Original file line number Diff line number Diff line change
Expand Up @@ -3453,7 +3453,7 @@ if (exinfo$ExtractSkyDataFromNOAAClimateAtlas_USA || exinfo$ExtractSkyDataFromNC

} else if (sim_cells_or_points == "cell") {
cell_res_noaaca <- align_with_target_res(res_from = sim_res, crs_from = sim_crs,
sp = run_sites[do_extract, ], crs_sp = crs_sites, crs_to = crs_data)
sp = sites_noaaca, crs_sp = crs_sites, crs_to = crs_data)
args_extract <- list(x = cell_res_noaaca, coords = sites_noaaca, crs_data = crs_data)
}

Expand Down Expand Up @@ -3499,7 +3499,7 @@ if (exinfo$ExtractSkyDataFromNOAAClimateAtlas_USA || exinfo$ExtractSkyDataFromNC
if (!is.null(args_chunk[["coords"]]))
args_chunk[["coords"]] <- args_chunk[["coords"]][do_chunks[[ic]], ]

monthlyclim[iextr, iv, ] <- do.call("extract_from_external_shapefile",
monthlyclim[iextr, iv, m] <- do.call("extract_from_external_shapefile",
args = c(args_chunk,
file_path = list(dir_noaaca[[iv]]),
file_shp = list(files_shp[[iv]][m]),
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: SWSF
Title: SOILWAT Simulation Framework
Version: 1.1.1
Version: 1.1.2
Authors@R: c(person("Daniel", "Schlaepfer", email = "daniel.schlaepfer@unibas.ch", role = c("aut", "cre")),
person("Ryan", "Murphy", role = "ctb", email = "not@available.com"))
Description: An R wrapper for simulation experiments with SOILWAT
Expand Down

0 comments on commit d633b2c

Please sign in to comment.