From b4ea6c4bd736aa2e0cacac404089bfe818e48cfe Mon Sep 17 00:00:00 2001 From: mlammens Date: Tue, 12 Mar 2024 14:27:41 -0400 Subject: [PATCH 01/14] Added `occs.sel` to the return() in the `poccs_selectOccs` function. Without this, the function returns NULL in some circumstances in the Rmd code generated from a session. --- R/poccs_selectOccs.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/poccs_selectOccs.R b/R/poccs_selectOccs.R index 1d15ea25..2b22c156 100644 --- a/R/poccs_selectOccs.R +++ b/R/poccs_selectOccs.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # poccs_selectOccs.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -98,7 +98,7 @@ poccs_selectOccs <- function(occs, polySelXY, polySelID = 1, logger = NULL, hlSpp(spN), "Your polygon is selecting all occurrences. None will be removed.") occs.sel <- occs - return() + return(occs.sel) } occs.sel <- occs[-ptRemIndex,] From 661fab970d2260e302f4e7854d5076fa6cf5921f Mon Sep 17 00:00:00 2001 From: Bethany Johnson Date: Tue, 9 Jul 2024 20:59:08 -0400 Subject: [PATCH 02/14] updated version # and added news [v2.1.3_draft] --- DESCRIPTION | 36 ++++++++++++++--------------- NEWS.md | 8 +++++++ README.md | 4 ++-- inst/shiny/Rmd/text_about.Rmd | 2 +- inst/shiny/Rmd/text_intro_tab.Rmd | 2 +- inst/shiny/Rmd/userReport_intro.Rmd | 2 +- 6 files changed, 31 insertions(+), 23 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index d6a78f0e..906a8f48 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: wallace -Version: 2.1.2 -Date: 2024-03-08 +Version: 2.1.3 +Date: 2024-07-09 Title: A Modular Platform for Reproducible Modeling of Species Niches and Distributions Description: The 'shiny' application Wallace is a modular platform for @@ -14,22 +14,22 @@ Description: The 'shiny' application Wallace is a modular platform for Authors@R: c(person("Jamie M.", "Kass", email = "jamie.kass@oist.jp", role = "aut"), person("Gonzalo E.", "Pinilla-Buitrago", email = "gepinillab@gmail.com", role = "aut"), - person("Andrea", "Paz", email = "paz.andreita@gmail.com", role = "aut"), - person("Bethany A.", "Johnson", email = "bjohnso005@citymail.cuny.edu", role = "aut"), - person("Valentina", "Grisales-Betancur", email = "vgrisale@eafit.edu.co", role = "aut"), - person("Dean", "Attali", email = "daattali@gmail.com", role = "aut"), - person("Matthew E.", "Aiello-Lammens", email = "matt.lammens@gmail.com", role = "aut"), - person("Cory", "Merow", email = "corymerow@gmail.com", role = "aut"), - person("Mary E.", "Blair", email = "mblair1@amnh.org", role = c("aut", "cre")), - person("Robert P.", "Anderson", email = "randerson@ccny.cuny.edu", role = "aut"), - person("Sarah I.", "Meenan", email = "sarah.meenan@gmail.com", role = "ctb"), - person("Olivier", "Broennimann", email = "olivier.broennimann@unil.ch", role = "ctb"), - person("Peter J.", "Galante", email = "pgalante@amnh.org", role = "ctb"), - person("Brian S.", "Maitner", email = "bmaitner@gmail.com", role = "ctb"), - person("Hannah L.", "Owens", email = "hannah.owens@gmail.com", role = "ctb"), - person("Sara", "Varela", email = "sara_varela@yahoo.com", role = "ctb"), - person("Bruno", "Vilela", email = "bvilela@wustl.edu", role = "ctb"), - person("Robert", "Muscarella", email = "bob.muscarella@gmail.com", role = "ctb")) + person("Andrea", "Paz", email = "paz.andreita@gmail.com", role = "aut"), + person("Bethany A.", "Johnson", email = "bjohnso005@citymail.cuny.edu", role = "aut"), + person("Valentina", "Grisales-Betancur", email = "vgrisale@eafit.edu.co", role = "aut"), + person("Dean", "Attali", email = "daattali@gmail.com", role = "aut"), + person("Matthew E.", "Aiello-Lammens", email = "matt.lammens@gmail.com", role = "aut"), + person("Cory", "Merow", email = "corymerow@gmail.com", role = "aut"), + person("Mary E.", "Blair", email = "mblair1@amnh.org", role = c("aut", "cre")), + person("Robert P.", "Anderson", email = "randerson@ccny.cuny.edu", role = "aut"), + person("Sarah I.", "Meenan", email = "sarah.meenan@gmail.com", role = "ctb"), + person("Olivier", "Broennimann", email = "olivier.broennimann@unil.ch", role = "ctb"), + person("Peter J.", "Galante", email = "pgalante@amnh.org", role = "ctb"), + person("Brian S.", "Maitner", email = "bmaitner@gmail.com", role = "ctb"), + person("Hannah L.", "Owens", email = "hannah.owens@gmail.com", role = "ctb"), + person("Sara", "Varela", email = "sara_varela@yahoo.com", role = "ctb"), + person("Bruno", "Vilela", email = "bvilela@wustl.edu", role = "ctb"), + person("Robert", "Muscarella", email = "bob.muscarella@gmail.com", role = "ctb")) Depends: R (>= 3.5.0), shiny (>= 1.6.0), diff --git a/NEWS.md b/NEWS.md index 455f3d80..11527ba1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,11 @@ +wallace 2.1.3 +============= +- Fixed NULL error in poccs_selectOccs Rmd code +- +- +- +- + wallace 2.1.2 ============= - Fixed FAIL in test_occs_queryDB diff --git a/README.md b/README.md index fb768f06..dd5694ac 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![R-CMD-check](https://github.com/wallaceEcoMod/wallace/workflows/R-CMD-check/badge.svg)](https://github.com/wallaceEcoMod/wallace/actions) [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![CRAN version](http://www.r-pkg.org/badges/version/wallace)](https://CRAN.R-project.org/package=wallace) [![downloads](https://cranlogs.r-pkg.org:443/badges/grand-total/wallace?color=orange)](https://cranlogs.r-pkg.org:443/badges/grand-total/wallace?color=orange) -# Wallace (v2.1.2) +# Wallace (v2.1.3) *Wallace* is a modular platform for reproducible modeling of species niches and distributions, written in R. The application guides users through a complete analysis, from the acquisition of data to visualizing model predictions on an interactive map, thus bundling complex workflows into a single, streamlined interface. @@ -27,7 +27,7 @@ run_wallace() Please make sure you have installed the latest versions of both R (Mac OS, Windows) and RStudio (Mac OS / Windows: choose the free version). #### How to run Maxent with maxent.jar -*Wallace* v2.1.2 includes two options to run Maxent models: maxnet and maxent.jar. The former, which is an R implementation and fits the model with the package `glmnet`, is now the default and does not require the package `rJava` (see Phillips et al. 2017). The latter, which is the Java implementation, runs the `maxent()` function in the package `dismo`. This function requires the user to place the `maxent.jar` file in the `/java` directory of the `dismo` package root folder. You can download Maxent here, and locate `maxent.jar`, which is the Maxent program itself, in the downloaded folder. You can find the directory path to `dismo/java` by running `system.file('java', package="dismo")` at the R console. Simply copy `maxent.jar` and paste it into this folder. If you try to run Maxent in *Wallace* without the file in place, you will get a warning message in the log window and Maxent will not run. +*Wallace* v2.1.3 includes two options to run Maxent models: maxnet and maxent.jar. The former, which is an R implementation and fits the model with the package `glmnet`, is now the default and does not require the package `rJava` (see Phillips et al. 2017). The latter, which is the Java implementation, runs the `maxent()` function in the package `dismo`. This function requires the user to place the `maxent.jar` file in the `/java` directory of the `dismo` package root folder. You can download Maxent here, and locate `maxent.jar`, which is the Maxent program itself, in the downloaded folder. You can find the directory path to `dismo/java` by running `system.file('java', package="dismo")` at the R console. Simply copy `maxent.jar` and paste it into this folder. If you try to run Maxent in *Wallace* without the file in place, you will get a warning message in the log window and Maxent will not run. ### Potential Issues diff --git a/inst/shiny/Rmd/text_about.Rmd b/inst/shiny/Rmd/text_about.Rmd index 6aeabe23..c68aabda 100644 --- a/inst/shiny/Rmd/text_about.Rmd +++ b/inst/shiny/Rmd/text_about.Rmd @@ -7,7 +7,7 @@ output: html_document logo -Welcome to *Wallace*, a flexible application for reproducible ecological modeling, built for community expansion. The current version of *Wallace* (v2.1.2) steps the user through a full niche/distribution modeling analysis, from data acquisition to visualizing results. +Welcome to *Wallace*, a flexible application for reproducible ecological modeling, built for community expansion. The current version of *Wallace* (v2.1.3) steps the user through a full niche/distribution modeling analysis, from data acquisition to visualizing results. The application is written in `R` with the web app development package `shiny`. Please find the stable version of *Wallace* on CRAN, and the development version on Github. We also maintain a *Wallace* website that has some basic info, links, and will be updated with tutorial materials in the near future. diff --git a/inst/shiny/Rmd/text_intro_tab.Rmd b/inst/shiny/Rmd/text_intro_tab.Rmd index 6a4809ee..1e8deddd 100644 --- a/inst/shiny/Rmd/text_intro_tab.Rmd +++ b/inst/shiny/Rmd/text_intro_tab.Rmd @@ -5,7 +5,7 @@ output: html_document #### WORKFLOW -*Wallace* (v2.1.2) currently includes ten components, or steps of a possible workflow. Each component includes two or more modules, which are possible analyses for that step. +*Wallace* (v2.1.3) currently includes ten components, or steps of a possible workflow. Each component includes two or more modules, which are possible analyses for that step. **Components:** diff --git a/inst/shiny/Rmd/userReport_intro.Rmd b/inst/shiny/Rmd/userReport_intro.Rmd index 7013bc29..345a8e56 100644 --- a/inst/shiny/Rmd/userReport_intro.Rmd +++ b/inst/shiny/Rmd/userReport_intro.Rmd @@ -10,7 +10,7 @@ knit_engines$set(asis = function(options) { knitr::opts_chunk$set(message = FALSE, warning = FALSE, eval = FALSE) ``` -Please find below the R code history from your *Wallace* v2.1.2 session. +Please find below the R code history from your *Wallace* v2.1.3 session. You can reproduce your session results by running this R Markdown file in RStudio. From da47b907c0f44ca4c7ae0580b63e800bbf1c7dd5 Mon Sep 17 00:00:00 2001 From: Bethany Johnson Date: Tue, 9 Jul 2024 21:15:12 -0400 Subject: [PATCH 03/14] add Results tab msg to bioclim envelope plots --- inst/shiny/modules/vis_bioclimPlot.R | 5 +++-- inst/shiny/modules/vis_maxentEvalPlot.R | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/inst/shiny/modules/vis_bioclimPlot.R b/inst/shiny/modules/vis_bioclimPlot.R index 8bf68cf7..1166cd5a 100644 --- a/inst/shiny/modules/vis_bioclimPlot.R +++ b/inst/shiny/modules/vis_bioclimPlot.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # vis_bioclimPlot.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -28,7 +28,8 @@ vis_bioclimPlot_module_ui <- function(id) { numericInput(ns("bc1"), "Axis 1", value = 1, min = 1, max = 19), numericInput(ns("bc2"), "Axis 2", value = 2, min = 1, max = 19), numericInput(ns("bcProb"), "Set threshold", value = 0.9, min = 0.75, - max = 1, step = 0.05) + max = 1, step = 0.05), + h5("BIOCLIM envelope plots are displayed automatically in 'Results' tab") ) } diff --git a/inst/shiny/modules/vis_maxentEvalPlot.R b/inst/shiny/modules/vis_maxentEvalPlot.R index 4be1dcc7..6fd0e022 100644 --- a/inst/shiny/modules/vis_maxentEvalPlot.R +++ b/inst/shiny/modules/vis_maxentEvalPlot.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # vis_maxentEvalPlot.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -32,7 +32,7 @@ vis_maxentEvalPlot_module_ui <- function(id) { "average OR 10%" = 'or.10p', "delta AICc" = 'delta.AICc'), selected = 'auc.val'), - h6("Maxent evaluation plots display automatically in 'Results' tab") + h5("Maxent evaluation plots display automatically in 'Results' tab") ) } From 111a8678b93d1f1fc7466cf36f37b6e58798af9c Mon Sep 17 00:00:00 2001 From: Bethany Johnson Date: Tue, 9 Jul 2024 21:21:59 -0400 Subject: [PATCH 04/14] fixed typos --- inst/shiny/modules/model_bioclim.Rmd | 2 +- inst/shiny/modules/xfer_area.R | 4 ++-- inst/shiny/modules/xfer_user.R | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inst/shiny/modules/model_bioclim.Rmd b/inst/shiny/modules/model_bioclim.Rmd index b2b5f16f..45924309 100644 --- a/inst/shiny/modules/model_bioclim.Rmd +++ b/inst/shiny/modules/model_bioclim.Rmd @@ -1,6 +1,6 @@ ```{asis, echo = {{model_bioclim_knit}}, eval = {{model_bioclim_knit}}, include = {{model_bioclim_knit}}} ### Build and Evaluate Niche Model -Generating a species distribution model using the bioclim alogorithm as implemented in ENMeval V2.0. +Generating a species distribution model using the bioclim algorithm as implemented in ENMeval V2.0. ``` ```{r, echo = {{model_bioclim_knit}}, include = {{model_bioclim_knit}}} diff --git a/inst/shiny/modules/xfer_area.R b/inst/shiny/modules/xfer_area.R index 0c71ae8d..4197e04a 100644 --- a/inst/shiny/modules/xfer_area.R +++ b/inst/shiny/modules/xfer_area.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # xfer_area.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -87,7 +87,7 @@ xfer_area_module_server <- function(input, output, session, common) { ns <- session$ns req(curSp(), evalOut()) if (spp[[curSp()]]$rmm$model$algorithms != "BIOCLIM") { - h5("Prediction output is the same than Visualize component ") + h5("Prediction output is the same as Visualize component ") } }) diff --git a/inst/shiny/modules/xfer_user.R b/inst/shiny/modules/xfer_user.R index 321643ea..ab118993 100644 --- a/inst/shiny/modules/xfer_user.R +++ b/inst/shiny/modules/xfer_user.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # xfer_user.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -107,7 +107,7 @@ xfer_user_module_server <- function(input, output, session, common) { ns <- session$ns req(curSp(), evalOut()) if (spp[[curSp()]]$rmm$model$algorithms != "BIOCLIM") { - h5("Prediction output is the same than Visualize component") + h5("Prediction output is the same as Visualize component") } }) From c98f9659740fca93e188577f6fc61cd9abc13fcd Mon Sep 17 00:00:00 2001 From: Bethany Johnson Date: Tue, 9 Jul 2024 21:32:59 -0400 Subject: [PATCH 05/14] updated JK email --- DESCRIPTION | 2 +- NEWS.md | 2 +- R/model_bioclim.R | 4 ++-- R/model_maxent.R | 4 ++-- R/run_wallace.R | 4 ++-- R/vis_bioclimPlot.R | 4 ++-- R/xfer_area.R | 4 ++-- R/xfer_mess.R | 4 ++-- R/xfer_time.R | 2 +- R/xfer_userEnvs.R | 4 ++-- man/model_bioclim.Rd | 2 +- man/model_maxent.Rd | 2 +- man/run_wallace.Rd | 2 +- man/vis_bioclimPlot.Rd | 2 +- man/xfer_area.Rd | 2 +- man/xfer_mess.Rd | 2 +- man/xfer_time.Rd | 2 +- man/xfer_userEnvs.Rd | 2 +- 18 files changed, 25 insertions(+), 25 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 906a8f48..a9aaed91 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -12,7 +12,7 @@ Description: The 'shiny' application Wallace is a modular platform for most package functionality can be found on the package's GitHub Pages website: . Authors@R: - c(person("Jamie M.", "Kass", email = "jamie.kass@oist.jp", role = "aut"), + c(person("Jamie M.", "Kass", email = "jamie.m.kass@gmail.com", role = "aut"), person("Gonzalo E.", "Pinilla-Buitrago", email = "gepinillab@gmail.com", role = "aut"), person("Andrea", "Paz", email = "paz.andreita@gmail.com", role = "aut"), person("Bethany A.", "Johnson", email = "bjohnso005@citymail.cuny.edu", role = "aut"), diff --git a/NEWS.md b/NEWS.md index 11527ba1..b64f520c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,7 @@ wallace 2.1.3 ============= - Fixed NULL error in poccs_selectOccs Rmd code -- +- Updated JK's email - - - diff --git a/R/model_bioclim.R b/R/model_bioclim.R index 699afcd6..ac3499fa 100644 --- a/R/model_bioclim.R +++ b/R/model_bioclim.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # model_bioclim.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -61,7 +61,7 @@ #' @return Function returns an ENMevaluate object with all the evaluated models #' and a selection of appropriate fields. -#' @author Jamie M. Kass +#' @author Jamie M. Kass #' @author Gonzalo E. Pinilla-Buitrago # @note diff --git a/R/model_maxent.R b/R/model_maxent.R index 6e2db682..e7ec30c5 100644 --- a/R/model_maxent.R +++ b/R/model_maxent.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # model_maxent.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -83,7 +83,7 @@ #' #' @return Function returns an ENMevaluate object with all the evaluated models #' and a selection of appropriate fields. -#' @author Jamie M. Kass +#' @author Jamie M. Kass #' @author Gonzalo E. Pinilla-Buitrago # @note diff --git a/R/run_wallace.R b/R/run_wallace.R index d86cd7bf..df0d952b 100644 --- a/R/run_wallace.R +++ b/R/run_wallace.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # run_wallace.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -36,7 +36,7 @@ #' if(interactive()) { #' run_wallace() #' } -#' @author Jamie Kass +#' @author Jamie Kass #' @author Gonzalo E. Pinilla-Buitrago #' @export run_wallace <- function(launch.browser = TRUE, port = getOption("shiny.port")) { diff --git a/R/vis_bioclimPlot.R b/R/vis_bioclimPlot.R index 2b3c4b38..d979c50f 100644 --- a/R/vis_bioclimPlot.R +++ b/R/vis_bioclimPlot.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # vis_bioclimPlot.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -66,7 +66,7 @@ #' that are inside the envelope for all layers (included those not plotted) #' are shown as green circles and those outside of the envelope for one ore #' more variables are plotted as orange triangles. -#' @author Jamie Kass +#' @author Jamie Kass #' @author Gonzalo E. Pinilla-Buitrago # @note #' @seealso diff --git a/R/xfer_area.R b/R/xfer_area.R index f89aedde..3de6b37c 100644 --- a/R/xfer_area.R +++ b/R/xfer_area.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # xfer_area.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -81,7 +81,7 @@ #' RasterBrick or a RasterStack of the environmental variables cropped to the #' area of transfer. The second element is a raster of the transferred model with #' the specified output type. -#' @author Jamie Kass +#' @author Jamie Kass #' @author Andrea Paz #' @author Gonzalo E. Pinilla-Buitrago # @note diff --git a/R/xfer_mess.R b/R/xfer_mess.R index ed61838e..28efe4e4 100644 --- a/R/xfer_mess.R +++ b/R/xfer_mess.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # xfer_mess.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -69,7 +69,7 @@ #' xferExtRas = envsFut) #' } # @return -#' @author Jamie Kass +#' @author Jamie Kass #' @author Gonzalo E. Pinilla-Buitrago # @note diff --git a/R/xfer_time.R b/R/xfer_time.R index 14e2c0b1..832f4fcd 100644 --- a/R/xfer_time.R +++ b/R/xfer_time.R @@ -92,7 +92,7 @@ #' RasterBrick or RasterStack of the environmental variables cropped to the #' area of transfer. The second element is a raster of the transferred model #' with the specified output type. -#' @author Jamie Kass +#' @author Jamie Kass #' @author Andrea Paz #' @author Gonzalo E. Pinilla-Buitrago #' @author Bethany A. Johnson diff --git a/R/xfer_userEnvs.R b/R/xfer_userEnvs.R index 6a2c0fce..7db133ce 100644 --- a/R/xfer_userEnvs.R +++ b/R/xfer_userEnvs.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # xfer_userEnvs.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -76,7 +76,7 @@ #' clamp = FALSE, xfExt = polyExt) #' } #' -#' @author Jamie Kass +#' @author Jamie Kass #' @author Andrea Paz #' @author Gonzalo E. Pinilla-Buitrago # @note diff --git a/man/model_bioclim.Rd b/man/model_bioclim.Rd index 960fabd7..ef316188 100644 --- a/man/model_bioclim.Rd +++ b/man/model_bioclim.Rd @@ -57,7 +57,7 @@ m <- model_bioclim(occs, bg, partblock, envs) \code{\link[ENMeval]{ENMevaluate}} } \author{ -Jamie M. Kass +Jamie M. Kass Gonzalo E. Pinilla-Buitrago } diff --git a/man/model_maxent.Rd b/man/model_maxent.Rd index 6a2e5ac4..5a443d9a 100644 --- a/man/model_maxent.Rd +++ b/man/model_maxent.Rd @@ -101,7 +101,7 @@ m <- model_maxent(occs = occs, bg = bg, user.grp = partblock, \code{\link[ENMeval]{ENMevaluate}} } \author{ -Jamie M. Kass +Jamie M. Kass Gonzalo E. Pinilla-Buitrago } diff --git a/man/run_wallace.Rd b/man/run_wallace.Rd index c73d0b4f..3a43abd7 100644 --- a/man/run_wallace.Rd +++ b/man/run_wallace.Rd @@ -28,7 +28,7 @@ run_wallace() } } \author{ -Jamie Kass +Jamie Kass Gonzalo E. Pinilla-Buitrago } diff --git a/man/vis_bioclimPlot.Rd b/man/vis_bioclimPlot.Rd index 8bb4d8f3..51f557fa 100644 --- a/man/vis_bioclimPlot.Rd +++ b/man/vis_bioclimPlot.Rd @@ -61,7 +61,7 @@ bioclimPlot <- vis_bioclimPlot(x = m@models$bioclim, \code{\link{model_bioclim}} \code{\link[ENMeval]{ENMevaluate}} } \author{ -Jamie Kass +Jamie Kass Gonzalo E. Pinilla-Buitrago } diff --git a/man/xfer_area.Rd b/man/xfer_area.Rd index 476f9429..a8aa1863 100644 --- a/man/xfer_area.Rd +++ b/man/xfer_area.Rd @@ -94,7 +94,7 @@ modXfer <- xfer_area(evalOut = m, curModel = 1, envs, \code{\link{xfer_userEnvs}} } \author{ -Jamie Kass +Jamie Kass Andrea Paz diff --git a/man/xfer_mess.Rd b/man/xfer_mess.Rd index 68186377..3b14f221 100644 --- a/man/xfer_mess.Rd +++ b/man/xfer_mess.Rd @@ -65,7 +65,7 @@ xferMess <- xfer_mess(occs = occsEnvs, bg = bgEnvs, bgMsk = envs, \code{\link{xfer_userEnvs}} } \author{ -Jamie Kass +Jamie Kass Gonzalo E. Pinilla-Buitrago } diff --git a/man/xfer_time.Rd b/man/xfer_time.Rd index 455f56bd..2f187e21 100644 --- a/man/xfer_time.Rd +++ b/man/xfer_time.Rd @@ -103,7 +103,7 @@ modXfer <- xfer_time(evalOut = m, curModel = 1, \code{\link{xfer_userEnvs}} } \author{ -Jamie Kass +Jamie Kass Andrea Paz diff --git a/man/xfer_userEnvs.Rd b/man/xfer_userEnvs.Rd index 35a67480..52c5fc7c 100644 --- a/man/xfer_userEnvs.Rd +++ b/man/xfer_userEnvs.Rd @@ -88,7 +88,7 @@ modXfer <- xfer_userEnvs(evalOut = m, curModel = 1, envs = envsFut, \code{\link{xfer_userExtent}} } \author{ -Jamie Kass +Jamie Kass Andrea Paz From fe7d3aeaf3c4b48b43c61d4cb4dfe44638a59b96 Mon Sep 17 00:00:00 2001 From: Bethany Johnson Date: Tue, 9 Jul 2024 21:44:57 -0400 Subject: [PATCH 06/14] add model to file name when saving; Fixes #406 --- NEWS.md | 2 +- inst/shiny/server.R | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NEWS.md b/NEWS.md index b64f520c..9c0d6f44 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ wallace 2.1.3 ============= - Fixed NULL error in poccs_selectOccs Rmd code - Updated JK's email -- +- Added model name (FC + RM) to file name when prediction downloaded - - diff --git a/inst/shiny/server.R b/inst/shiny/server.R index c70d1096..7439c0cd 100644 --- a/inst/shiny/server.R +++ b/inst/shiny/server.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # server.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -785,9 +785,9 @@ function(input, output, session) { thresholdRule <- rmm()$prediction$binary$thresholdRule predType <- rmm()$prediction$notes if (thresholdRule == 'none') { - paste0(curSp(), "_", predType, '.', ext) + paste0(curSp(), "_", curModel(), "_", predType, '.', ext) } else { - paste0(curSp(), "_", thresholdRule, '.', ext) + paste0(curSp(), "_", curModel(), "_", thresholdRule, '.', ext) } }, content = function(file) { From 0a898624dd2042afe074d63d0d0746e6e1ca4392 Mon Sep 17 00:00:00 2001 From: Bethany Johnson Date: Wed, 10 Jul 2024 17:31:14 -0400 Subject: [PATCH 07/14] DL Fix: Response curves code can now be added to session code file --- NEWS.md | 2 +- inst/shiny/modules/vis_responsePlot.R | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NEWS.md b/NEWS.md index 9c0d6f44..a25d61d9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,7 +3,7 @@ wallace 2.1.3 - Fixed NULL error in poccs_selectOccs Rmd code - Updated JK's email - Added model name (FC + RM) to file name when prediction downloaded -- +- Fixed vis_responsePlot knitting to Rmd - wallace 2.1.2 diff --git a/inst/shiny/modules/vis_responsePlot.R b/inst/shiny/modules/vis_responsePlot.R index 02a4c0b6..c180303a 100644 --- a/inst/shiny/modules/vis_responsePlot.R +++ b/inst/shiny/modules/vis_responsePlot.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # vis_responsePlot.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -38,14 +38,15 @@ vis_responsePlot_module_server <- function(input, output, session, common) { curEnv <- common$curEnv evalOut <- common$evalOut - observeEvent(input,{ + observe({ req(curSp()) req(curModel()) req(evalOut()) #for rmd - spp[[curSp()]]$rmd$vis_responsePlot <- TRUE + if (spp[[curSp()]]$rmm$model$algorithms == "maxnet" | spp[[curSp()]]$rmm$model$algorithms == "maxent.jar"){ spp[[curSp()]]$rmd$vis_curModel <- curModel() + spp[[curSp()]]$rmd$vis_responsePlot <- TRUE } }) From 5cc995e6272c41e5ea3fda97285061e13423a2d2 Mon Sep 17 00:00:00 2001 From: Bethany Johnson Date: Tue, 16 Jul 2024 14:24:07 -0400 Subject: [PATCH 08/14] warning instead of error with userEnvs NA values; fixed disable_module(); Fixes #431 --- NEWS.md | 3 ++- inst/shiny/modules/envs_userEnvs.R | 15 ++++++++++----- inst/shiny/modules/envs_userEnvs.md | 4 ++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/NEWS.md b/NEWS.md index a25d61d9..0d84f80b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,8 @@ wallace 2.1.3 - Updated JK's email - Added model name (FC + RM) to file name when prediction downloaded - Fixed vis_responsePlot knitting to Rmd -- +- Fixed NA value warning in userEnvs +- Fixed broken function to disable `xfer_time` when using `envs_userEnvs` wallace 2.1.2 ============= diff --git a/inst/shiny/modules/envs_userEnvs.R b/inst/shiny/modules/envs_userEnvs.R index 3e0ec60c..8cba349a 100644 --- a/inst/shiny/modules/envs_userEnvs.R +++ b/inst/shiny/modules/envs_userEnvs.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # envs_userEnvs.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -79,9 +79,14 @@ envs_userEnvs_module_server <- function(input, output, session, common) { if (length(unique(checkNA$isNA)) != 1) { logger %>% writeLog( - type = "error", - 'Input rasters have unmatching NAs pixel values.') - return() + type = "warning", + 'Input rasters have unmatching NA pixel values. + This may cause issues in further analyses. + See Module Guidance for more info.') + # BAJ 7/16/2024 if users report problems with espace, add... + #common$disable_module(component = "espace", module = "pca") + #common$disable_module(component = "espace", module = "occDens") + #common$disable_module(component = "espace", module = "nicheOv") } # loop over all species if batch is on @@ -146,7 +151,7 @@ envs_userEnvs_module_server <- function(input, output, session, common) { } common$update_component(tab = "Results") - common$disable_module(component = "xfer", module = "xferTime") + common$disable_module(component = "xfer", module = "time") }) output$envsPrint <- renderPrint({ diff --git a/inst/shiny/modules/envs_userEnvs.md b/inst/shiny/modules/envs_userEnvs.md index 6bad8892..5e2165f8 100644 --- a/inst/shiny/modules/envs_userEnvs.md +++ b/inst/shiny/modules/envs_userEnvs.md @@ -25,3 +25,7 @@ writeRaster(r, path_to_new_projected_raster_file) Users will need to know what the original CRS of their rasters is, then look up (i.e., Google search) its proj4 format. After saving, upload the new projected rasters and continue with your analysis. *NOTE: A reminder that some file types like .asc cannot embed CRS information in the file, so please avoid these types -- instead use types such as .tif that retain the CRS.* + +A warning message will appear if your layers have NA values falling in pixels that are not consistent among each layer. You can continue using them, but some downstream steps of analyses may not be functional. Alternatively, you can assign values in a GIS program or mask the layers to have matching NA values outside of Wallace in R. + +Using your own environmental data will disable the Module: *Transfer to New Time*, as this module requires WorldClim bioclimatic variables. The Module: *Transfer to User Environments* is still available. From 0c2a4dd6ae5c97552ef21e8fef4e8630054f032c Mon Sep 17 00:00:00 2001 From: Bethany Johnson Date: Tue, 16 Jul 2024 17:40:38 -0400 Subject: [PATCH 09/14] replace `raster::getdata()` with `geodata::` for envs_worldclim; update GT for WCv2.1 --- DESCRIPTION | 1 + NEWS.md | 2 ++ R/envs_worldclim.R | 29 ++++++++++++++++++--------- inst/shiny/modules/envs_worldclim.R | 4 ++-- inst/shiny/modules/envs_worldclim.Rmd | 2 +- inst/shiny/modules/envs_worldclim.md | 12 +++++------ inst/shiny/modules/envs_worldclim.yml | 4 ++-- man/envs_worldclim.Rd | 4 +++- 8 files changed, 37 insertions(+), 21 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index a9aaed91..82d35697 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -39,6 +39,7 @@ Imports: DT (>= 0.5), ecospat (>= 4.0.0), ENMeval (>= 2.0.3), + geodata, knitcitations, leafem, leaflet.extras (>= 1.0.0), diff --git a/NEWS.md b/NEWS.md index 0d84f80b..29500fb9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,6 +6,8 @@ wallace 2.1.3 - Fixed vis_responsePlot knitting to Rmd - Fixed NA value warning in userEnvs - Fixed broken function to disable `xfer_time` when using `envs_userEnvs` +- Replaced `raster::getdata` with `geodata` functions +- Now using WorldClim v2.1 env data! wallace 2.1.2 ============= diff --git a/R/envs_worldclim.R b/R/envs_worldclim.R index 98ed0c04..1564034e 100644 --- a/R/envs_worldclim.R +++ b/R/envs_worldclim.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # envs_worldclim.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -53,8 +53,9 @@ #' #' @author Jamie Kass #' @author Gonzalo E. Pinilla-Buitrago +#' @author Bethany A. Johnson #' -#' @seealso \code{\link[raster]{getData}} +#' @seealso \code{\link[geodata]{worldclim_global}}, \code{\link[geodata]{worldclim_tile}} #' #' @export @@ -66,20 +67,30 @@ envs_worldclim <- function(bcRes, bcSel, mapCntr, doBrick = FALSE, } smartProgress(logger, message = "Retrieving WorldClim data...", { - wcbc <- raster::getData(name = "worldclim", var = "bio", res = bcRes, - lon = mapCntr[1], lat = mapCntr[2]) - # change names if bio01 is bio1, and so forth - if (bcRes == 0.5) { - names(wcbc) <- gsub("_.*", "", names(wcbc)) - } + if (bcRes == 0.5) { + wcbc <- geodata::worldclim_tile(var = "bio", + lon = mapCntr[1], lat = mapCntr[2], + path = tempdir(), + version="2.1") + } else { + wcbc <- geodata::worldclim_global(var = "bio", + res = bcRes, + path = tempdir(), + version = "2.1") + } + # change names to bioXX + names(wcbc) <- gsub(".*_", "bio", names(wcbc)) + # change names if bio01 is bio1, and so forth i <- grep('bio[0-9]$', names(wcbc)) editNames <- paste('bio', sapply(strsplit(names(wcbc)[i], 'bio'), function(x) x[2]), sep = '0') names(wcbc)[i] <- editNames - wcbc <- wcbc[[bcSel]] }) + # convert from spatraster to raster + wcbc <- raster::stack(wcbc) + # convert to brick for faster processing if(doBrick == TRUE) { smartProgress(logger, diff --git a/inst/shiny/modules/envs_worldclim.R b/inst/shiny/modules/envs_worldclim.R index cf92e0c0..4fddb1f5 100644 --- a/inst/shiny/modules/envs_worldclim.R +++ b/inst/shiny/modules/envs_worldclim.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # envs_worldclim.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -150,7 +150,7 @@ envs_worldclim_module_server <- function(input, output, session, common) { spp[[sp]]$rmm$data$environment$yearMax <- 1990 spp[[sp]]$rmm$data$environment$resolution <- paste(round(raster::res(wcbc)[1] * 60, digits = 2), "minutes") spp[[sp]]$rmm$data$environment$extent <- as.character(raster::extent(wcbc)) - spp[[sp]]$rmm$data$environment$sources <- 'WorldClim 1.4' + spp[[sp]]$rmm$data$environment$sources <- 'WorldClim v2.1' spp[[sp]]$rmm$data$environment$projection <- as.character(raster::crs(wcbc)) spp[[sp]]$rmm$code$wallace$wcRes <- input$wcRes diff --git a/inst/shiny/modules/envs_worldclim.Rmd b/inst/shiny/modules/envs_worldclim.Rmd index 5b43bed5..a951f305 100644 --- a/inst/shiny/modules/envs_worldclim.Rmd +++ b/inst/shiny/modules/envs_worldclim.Rmd @@ -1,6 +1,6 @@ ```{asis, echo = {{envs_worldclim_knit}}, eval = {{envs_worldclim_knit}}, include = {{envs_worldclim_knit}}} ### Obtain environmental data -Using WorldClim (http://www.worldclim.org/) bioclimatic dataset at resolution of `r {{wcRes_rmd}}` arcmin. +Using WorldClim v2.1 (http://www.worldclim.org/) bioclimatic dataset at resolution of `r {{wcRes_rmd}}` arcmin. ``` ```{r, echo = {{envs_worldclim_knit}}, include = {{envs_worldclim_knit}}} diff --git a/inst/shiny/modules/envs_worldclim.md b/inst/shiny/modules/envs_worldclim.md index 4bb901d8..1d082903 100644 --- a/inst/shiny/modules/envs_worldclim.md +++ b/inst/shiny/modules/envs_worldclim.md @@ -2,7 +2,7 @@ **BACKGROUND** -The WorldClim project provides bioclimatic variables for the Earth's land surfaces for all continents except Antarctica. Monthly data from weather stations were spatially interpolated using elevation as a covariate; subsequently, 19 bioclimatic variables were derived, reflecting various aspects of temperature and precipitation (Hijmans et al. 2005). The descriptions of each variable are listed below, taken from the WorldClim website, where more details can be found. +The WorldClim project provides bioclimatic variables for the Earth's land surfaces for all continents except Antarctica. Monthly data from weather stations were spatially interpolated using elevation as a covariate; subsequently, 19 bioclimatic variables were derived, reflecting various aspects of temperature and precipitation (Fick & Hijmans 2017). The descriptions of each variable are listed below, taken from the WorldClim website, where more details can be found. BIO1 = Annual Mean Temperature BIO2 = Mean Diurnal Range (Mean of monthly (max temp - min temp)) @@ -26,10 +26,12 @@ BIO19 = Precipitation of Coldest Quarter **IMPLEMENTATION** -This module relies on the R package `raster` (Hijmans et al. 2021) to download bioclimatic variables from the WorldClim server. -*Wallace* makes all four resolutions of the data available (10 arcmin ≈ 20 km, 5 arcmin ≈ 10 km, 2.5 arcmin ≈ 5 km, and 30 arcsec ≈ 1 km). Although a later version of WorldClim exists (v2; Fick and Hijmans 2017), it is not available for automated download via the `raster` package; therefore, *Wallace* provides the data from WorldClim v1 (Hijmans et al. 2005). +This module relies on the R package `geodata` (Hijmans et al. 2024) to download WorldClim v2.1 bioclimatic variables from the WorldClim server (Fick and Hijmans 2017). +*Wallace* makes all four resolutions of the data available (10 arcmin ≈ 20 km, 5 arcmin ≈ 10 km, 2.5 arcmin ≈ 5 km, and 30 arcsec ≈ 1 km). + The finest-grain WorldClim dataset (30 arcsec) can only be downloaded by separate 30 x 30 degree tiles in the current implementation of dismo (1.1-1), so *Wallace* uses the current center of the map display as the tile reference for this resolution. This means that analyses with 30 arcsec climatic data using the current version of *Wallace* are restricted to the extent of a single tile. To visualize the tile, check the “30 arcsec tile” box in the bottom left corner of the map. This will let the user see if the occurrences are all contained within the tile or whether they extend beyond it. When running locally, the dataset is downloaded to the *Wallace* folder (which can take substantial time), but *Wallace* will use the downloaded data for later runs when the same resolution is selected. + The “Batch” option will load the environmental variables selected at the chosen resolution for all the species that have occurrence data uploaded. @@ -37,6 +39,4 @@ The “Batch” option will load the environmental variables selected at the cho Fick, S.E., & Hijmans, R.J. (2017). WorldClim 2: new 1-km spatial resolution climate surfaces for global land areas. *International Journal of Climatology*, 37(12), 4302-4315. DOI: 10.1002/joc.5086 -Hijmans, R.J., Cameron, S.E., Parra, J.L., Jones, P.G., & Jarvis, A. (2005). Very high resolution interpolated climate surfaces for global land areas. *International Journal of Climatology*, 25(15), 1965-1978. DOI: 10.1002/joc.1276 - -Hijmans, R.J., et al. (2021). raster: Geographic Data Analysis and Modeling. R package version 3.4-13. CRAN +Hijmans, R.J., et al. (2024). geodata: Download Geographic Data. R package version 0.6-2. CRAN diff --git a/inst/shiny/modules/envs_worldclim.yml b/inst/shiny/modules/envs_worldclim.yml index f1a76286..01cd5225 100644 --- a/inst/shiny/modules/envs_worldclim.yml +++ b/inst/shiny/modules/envs_worldclim.yml @@ -1,5 +1,5 @@ component: "envs" short_name: "WorldClim Bioclims" long_name: "WorldClim Bioclims" -authors: "Jamie M. Kass, Gonzalo E. Pinilla-Buitrago, Robert P. Anderson" -package: [raster] +authors: "Jamie M. Kass, Gonzalo E. Pinilla-Buitrago, Bethany A. Johnson, Robert P. Anderson" +package: [raster, geodata] diff --git a/man/envs_worldclim.Rd b/man/envs_worldclim.Rd index fcc5e7b1..9741b053 100644 --- a/man/envs_worldclim.Rd +++ b/man/envs_worldclim.Rd @@ -45,10 +45,12 @@ arcmin10 <- envs_worldclim(bcRes, bcSel = envar) } \seealso{ -\code{\link[raster]{getData}} +\code{\link[geodata]{worldclim_global}}, \code{\link[geodata]{worldclim_tile}} } \author{ Jamie Kass Gonzalo E. Pinilla-Buitrago + +Bethany A. Johnson } From aa3e8750beb608addcbc84e98d013f42ea36b737 Mon Sep 17 00:00:00 2001 From: Bethany Johnson Date: Wed, 17 Jul 2024 13:42:31 -0400 Subject: [PATCH 10/14] replace `raster::getdata()` with `geodata::` for xfer_time; update GT for WCv2.1 & SSPs --- NEWS.md | 2 +- R/xfer_area.R | 1 + R/xfer_userEnvs.R | 1 + inst/shiny/modules/envs_worldclim.R | 4 +- inst/shiny/modules/xfer_area.R | 6 +- inst/shiny/modules/xfer_time.R | 146 +++++++++++++++++----------- inst/shiny/modules/xfer_time.Rmd | 94 ++++++++++-------- inst/shiny/modules/xfer_time.md | 10 +- inst/shiny/modules/xfer_time.yml | 2 +- 9 files changed, 157 insertions(+), 109 deletions(-) diff --git a/NEWS.md b/NEWS.md index 29500fb9..147a2320 100644 --- a/NEWS.md +++ b/NEWS.md @@ -7,7 +7,7 @@ wallace 2.1.3 - Fixed NA value warning in userEnvs - Fixed broken function to disable `xfer_time` when using `envs_userEnvs` - Replaced `raster::getdata` with `geodata` functions -- Now using WorldClim v2.1 env data! +- WorldClim v2.1 bioclimatic variables now available for Envs & Xfer_time! wallace 2.1.2 ============= diff --git a/R/xfer_area.R b/R/xfer_area.R index 3de6b37c..f0c2e9cd 100644 --- a/R/xfer_area.R +++ b/R/xfer_area.R @@ -84,6 +84,7 @@ #' @author Jamie Kass #' @author Andrea Paz #' @author Gonzalo E. Pinilla-Buitrago +#' @author Bethany A. Johnson # @note #' @seealso \code{\link[dismo]{predict}}, \code{\link{xfer_time}} #' \code{\link{xfer_userEnvs}} diff --git a/R/xfer_userEnvs.R b/R/xfer_userEnvs.R index 7db133ce..8d87f0c7 100644 --- a/R/xfer_userEnvs.R +++ b/R/xfer_userEnvs.R @@ -79,6 +79,7 @@ #' @author Jamie Kass #' @author Andrea Paz #' @author Gonzalo E. Pinilla-Buitrago +#' @author Bethany A. Johnson # @note #' @seealso \code{\link[dismo]{predict}}, \code{\link{xfer_time}} #' \code{\link{xfer_userExtent}} diff --git a/inst/shiny/modules/envs_worldclim.R b/inst/shiny/modules/envs_worldclim.R index 4fddb1f5..0f39bf77 100644 --- a/inst/shiny/modules/envs_worldclim.R +++ b/inst/shiny/modules/envs_worldclim.R @@ -146,8 +146,8 @@ envs_worldclim_module_server <- function(input, output, session, common) { # METADATA #### spp[[sp]]$rmm$data$environment$variableNames <- names(wcbc) - spp[[sp]]$rmm$data$environment$yearMin <- 1960 - spp[[sp]]$rmm$data$environment$yearMax <- 1990 + spp[[sp]]$rmm$data$environment$yearMin <- 1970 + spp[[sp]]$rmm$data$environment$yearMax <- 2000 spp[[sp]]$rmm$data$environment$resolution <- paste(round(raster::res(wcbc)[1] * 60, digits = 2), "minutes") spp[[sp]]$rmm$data$environment$extent <- as.character(raster::extent(wcbc)) spp[[sp]]$rmm$data$environment$sources <- 'WorldClim v2.1' diff --git a/inst/shiny/modules/xfer_area.R b/inst/shiny/modules/xfer_area.R index 4197e04a..05975332 100644 --- a/inst/shiny/modules/xfer_area.R +++ b/inst/shiny/modules/xfer_area.R @@ -289,9 +289,9 @@ xfer_area_module_server <- function(input, output, session, common) { printVecAsis(raster::cellStats(xferExt, min), asChar = TRUE) spp[[curSp()]]$rmm$data$transfer$environment1$maxVal <- printVecAsis(raster::cellStats(xferExt, max), asChar = TRUE) - if (spp[[curSp()]]$rmm$data$environment$sources == 'WorldClim 1.4') { - spp[[curSp()]]$rmm$data$transfer$environment1$yearMin <- 1960 - spp[[curSp()]]$rmm$data$transfer$environment1$yearMax <- 1990 + if (spp[[curSp()]]$rmm$data$environment$sources == 'WorldClim 2.1') { + spp[[curSp()]]$rmm$data$transfer$environment1$yearMin <- 1970 + spp[[curSp()]]$rmm$data$transfer$environment1$yearMax <- 2000 } spp[[curSp()]]$rmm$data$transfer$environment1$resolution <- paste(round(raster::res(xferExt)[1] * 60, digits = 2), "degrees") diff --git a/inst/shiny/modules/xfer_time.R b/inst/shiny/modules/xfer_time.R index 0cb5205e..bce50933 100644 --- a/inst/shiny/modules/xfer_time.R +++ b/inst/shiny/modules/xfer_time.R @@ -72,15 +72,40 @@ xfer_time_module_ui <- function(id) { conditionalPanel(sprintf("input['%s'] == 'worldclim'", ns("selTimeVar")), selectInput(ns("selTime"), label = "Select time period", choices = list("Select period" = "", - "2050" = 50, - "2070" = 70)), - uiOutput(ns('selGCMui')), - selectInput(ns('selRCP'), label = "Select RCP", - choices = list("Select RCP" = "", - '2.6' = 26, - '4.5' = 45, - '6.0' = 60, - '8.5' = 85))), + "2021-2040" = "2021-2040", + "2041-2060" = "2041-2060", + "2061-2080" = "2061-2080")), + selectInput(ns("selGCM"), label = "Select global circulation model", + choices = list("Select GCM" = "", + "ACCESS-CM2" = "ACCESS-CM2", + "ACCESS-ESM1-5" = "ACCESS-ESM1-5", + "AWI-CM-1-1-MR" = "AWI-CM-1-1-MR", + "BCC-CSM2-MR" = "BCC-CSM2-MR", + "CanESM5" = "CanESM5", + "CanESM5-CanOE" = "CanESM5-CanOE", + "CMCC-ESM2" = "CMCC-ESM2", + "CNRM-CM6-1" = "CNRM-CM6-1", + "CNRM-CM6-1-HR" = "CNRM-CM6-1-HR", + "CNRM-ESM2-1" = "CNRM-ESM2-1", + "EC-Earth3-Veg" = "EC-Earth3-Veg", + "EC-Earth3-Veg-LR" = "EC-Earth3-Veg-LR", + "GISS-E2-1-G" = "GISS-E2-1-G", + "GISS-E2-1-H" = "GISS-E2-1-H", + "INM-CM4-8" = "INM-CM4-8", + "INM-CM5-0" = "INM-CM5-0", + "IPSL-CM6A-LR" = "IPSL-CM6A-LR", + "MIROC-ES2L" = "MIROC-ES2L", + "MIROC6" = "MIROC6", + "MPI-ESM1-2-HR" = "MPI-ESM1-2-HR", + "MPI-ESM1-2-LR" = "MPI-ESM1-2-LR", + "MRI-ESM2-0" = "MRI-ESM2-0", + "UKESM1-0-LL" = "UKESM1-0-LL")), + selectInput(ns('selRCP'), label = "Select shared socioeconomic pathway", + choices = list("Select SSP" = "", + "126" = "126", + "245" = "245", + "370" = "370", + "585" = "585"))), conditionalPanel(sprintf("input['%s'] == 'ecoclimate'", ns("selTimeVar")), tags$div(title = 'Select AOGCM', selectInput(ns("xfAOGCM"), @@ -154,22 +179,23 @@ xfer_time_module_server <- function(input, output, session, common) { MG = "MRI-CGCM3", NO = "NorESM1-M") # dynamic ui for GCM selection: choices differ depending on choice of time period - output$selGCMui <- renderUI({ - ns <- session$ns - - if (input$selTime == 'lgm') { - gcms <- c('CC', 'MR', 'MC') - } else if (input$selTime == 'mid') { - gcms <- c("BC", "CC", "CE", "CN", "HG", "IP", "MR", "ME", "MG") - } else { - gcms <- c("AC", "BC", "CC", "CE", "CN", "GF", "GD", "GS", "HD", - "HG", "HE", "IN", "IP", "MI", "MR", "MC", "MP", "MG", "NO") - } - names(gcms) <- GCMlookup[gcms] - gcms <- as.list(c("Select GCM" = "", gcms)) - selectInput(ns("selGCM"), label = "Select global circulation model", - choices = gcms) - }) + # 7/16/2024: BAJ removed after geodata & WCv2.1 update, but kept in case needed later + # output$selGCMui <- renderUI({ + # ns <- session$ns + # + # if (input$selTime == 'lgm') { + # gcms <- c('CC', 'MR', 'MC') + # } else if (input$selTime == 'mid') { + # gcms <- c("BC", "CC", "CE", "CN", "HG", "IP", "MR", "ME", "MG") + # } else { + # gcms <- c("AC", "BC", "CC", "CE", "CN", "GF", "GD", "GS", "HD", + # "HG", "HE", "IN", "IP", "MI", "MR", "MC", "MP", "MG", "NO") + # } + # names(gcms) <- GCMlookup[gcms] + # gcms <- as.list(c("Select GCM" = "", gcms)) + # selectInput(ns("selGCM"), label = "Select global circulation model", + # choices = gcms) + # }) observeEvent(input$goXferExtTime, { # ERRORS #### @@ -284,7 +310,7 @@ xfer_time_module_server <- function(input, output, session, common) { "). You can not transfer to a New Time.") return() } - #BAJ + if (input$selTimeVar == 'worldclim') { # warnings for wc selections if(input$selTime == "") { @@ -296,7 +322,7 @@ xfer_time_module_server <- function(input, output, session, common) { return() } if(input$selRCP == "") { - logger %>% writeLog(type = 'error', "Please select RCP.") + logger %>% writeLog(type = 'error', "Please select a SSP.") return() } } else if (input$selTimeVar == 'ecoclimate') { @@ -316,32 +342,42 @@ xfer_time_module_server <- function(input, output, session, common) { if (input$selTimeVar == 'worldclim') { # code taken from dismo getData() function to catch if user is trying to # download a missing combo of gcm / rcp - gcms <- c('AC', 'BC', 'CC', 'CE', 'CN', 'GF', 'GD', 'GS', 'HD', 'HG', 'HE', - 'IN', 'IP', 'MI', 'MR', 'MC', 'MP', 'MG', 'NO') - rcps <- c(26, 45, 60, 85) - m <- matrix(c(0,1,1,0,1,1,1,1,1,1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, - 1,1,1,1,1,1,1,0,1,1,0,0,1,0,1,1,1,0,0,1,1,1,1,0,1,1,1,1,1,0,1, - 0,1,1,1,1,1,1,1,1,1,1,1,1,1), ncol = 4) - i <- m[which(input$selGCM == gcms), which(input$selRCP == rcps)] - if (!i) { - logger %>% - writeLog(type = 'error', - paste0('This combination of GCM and RCP is not available. Please ', - 'make a different selection.')) - return() - } + # 7/16/2024: BAJ removed after geodata & WCv2.1 update, but kept in case needed later + # gcms <- c('AC', 'BC', 'CC', 'CE', 'CN', 'GF', 'GD', 'GS', 'HD', 'HG', 'HE', + # 'IN', 'IP', 'MI', 'MR', 'MC', 'MP', 'MG', 'NO') + # rcps <- c(26, 45, 60, 85) + # m <- matrix(c(0,1,1,0,1,1,1,1,1,1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, + # 1,1,1,1,1,1,1,0,1,1,0,0,1,0,1,1,1,0,0,1,1,1,1,0,1,1,1,1,1,0,1, + # 0,1,1,1,1,1,1,1,1,1,1,1,1,1), ncol = 4) + # i <- m[which(input$selGCM == gcms), which(input$selRCP == rcps)] + # if (!i) { + # logger %>% + # writeLog(type = 'error', + # paste0('This combination of GCM and RCP is not available. Please ', + # 'make a different selection.')) + # return() + # } + smartProgress( logger, message = paste("Retrieving WorldClim data for", input$selTime, input$selRCP, "..."), { + #BAJ eventually add 'if (res > 30){, cmip6_world(), }else use{ cmip6_tile()} xferTimeEnvs <- - raster::getData('CMIP5', var = "bio", res = round(envsRes * 60, 1), - rcp = input$selRCP, model = input$selGCM, - year = input$selTime) + geodata::cmip6_world(model = input$selGCM, + ssp = input$selRCP, + time = input$selTime, + var = "bio", + res = round(envsRes * 60, 1), + path=tempdir()) + #BAJ geodata::cmip6_tile(lon, lat, model, ssp, time, var, path) for 30arcsec tile + names(xferTimeEnvs) <- paste0('bio', c(paste0('0',1:9), 10:19)) # in case user subsetted bioclims xferTimeEnvs <- xferTimeEnvs[[names(envs())]] + # convert spatraster to raster + xferTimeEnvs <- raster::stack(xferTimeEnvs) } ) } else if (input$selTimeVar == 'ecoclimate') { @@ -409,11 +445,11 @@ xfer_time_module_server <- function(input, output, session, common) { } xferTimeThr <- xferTime > thr if (input$selTimeVar == 'worldclim') { - logger %>% writeLog(hlSpp(curSp()), "Transfer of model to ", paste0('20', input$selTime), + logger %>% writeLog(hlSpp(curSp()), "Transfer of model to ", input$selTime, ' with threshold ', input$threshold, ' (', formatC(thr, format = "e", 2), ") for GCM ", - GCMlookup[input$selGCM], " under RCP ", - as.numeric(input$selRCP)/10.0, ".") + input$selGCM, " under SSP ", + as.numeric(input$selRCP), ".") } else if (input$selTimeVar == 'ecoclimate') { logger %>% writeLog(hlSpp(curSp()), "Transfer of model to ", input$xfScenario, ' with threshold ', input$threshold, ' (', @@ -423,9 +459,9 @@ xfer_time_module_server <- function(input, output, session, common) { } else { xferTimeThr <- xferTime if (input$selTimeVar == 'worldclim') { - logger %>% writeLog(hlSpp(curSp()), "Transfer of model to ", paste0('20', input$selTime), - ' with ', predType, " output for GCM ", GCMlookup[input$selGCM], - " under RCP ", as.numeric(input$selRCP)/10.0, ".") + logger %>% writeLog(hlSpp(curSp()), "Transfer of model to ", input$selTime, + ' with ', predType, " output for GCM ", input$selGCM, + " under SSP ", as.numeric(input$selRCP), ".") } else if (input$selTimeVar == 'ecoclimate') { logger %>% writeLog(hlSpp(curSp()), "Transfer of model to ", input$xfScenario, ' with ', predType, " output for GCM ", input$xfAOGCM, ".") @@ -441,7 +477,7 @@ xfer_time_module_server <- function(input, output, session, common) { spp[[curSp()]]$transfer$mapXfer <- xferTimeThr spp[[curSp()]]$transfer$mapXferVals <- getRasterVals(xferTimeThr, predType) if (input$selTimeVar == "worldclim") { - spp[[curSp()]]$transfer$xfEnvsDl <- paste0('CMIP5_', envsRes * 60, "min_RCP", + spp[[curSp()]]$transfer$xfEnvsDl <- paste0('CMIP5_', envsRes * 60, "min_SSP", input$selRCP, "_", input$selGCM, "_", input$selTime) } else if (input$selTimeVar == "ecoclimate") { @@ -466,7 +502,7 @@ xfer_time_module_server <- function(input, output, session, common) { spp[[curSp()]]$rmm$data$transfer$environment1$extentRule <- "transfer to user-selected new time" if (input$selTimeVar == "worldclim") { - xferYr <- paste0('20', input$selTime) + xferYr <- input$selTime ###For RMD only spp[[curSp()]]$rmm$code$wallace$transfer_worldclim <- TRUE spp[[curSp()]]$rmm$code$wallace$transfer_GCM <- input$selGCM @@ -475,11 +511,11 @@ xfer_time_module_server <- function(input, output, session, common) { spp[[curSp()]]$rmm$data$transfer$environment1$yearMin <- xferYr spp[[curSp()]]$rmm$data$transfer$environment1$yearMax <- xferYr - spp[[curSp()]]$rmm$data$transfer$environment1$sources <- "WorldClim 1.4" + spp[[curSp()]]$rmm$data$transfer$environment1$sources <- "WorldClim 2.1" spp[[curSp()]]$rmm$data$transfer$environment1$notes <- paste("transfer to year", xferYr, "for GCM", - GCMlookup[input$selGCM], "under RCP", - as.numeric(input$selRCP)/10.0) + input$selGCM, "under SSP", + as.numeric(input$selRCP)) } else if (input$selTimeVar == "ecoclimate") { spp[[curSp()]]$rmm$code$wallace$transfer_ecoclimate <- TRUE spp[[curSp()]]$rmm$code$wallace$transfer_AOGCM <- input$xfAOGCM diff --git a/inst/shiny/modules/xfer_time.Rmd b/inst/shiny/modules/xfer_time.Rmd index 7bcba89f..e5b6ab3d 100644 --- a/inst/shiny/modules/xfer_time.Rmd +++ b/inst/shiny/modules/xfer_time.Rmd @@ -1,21 +1,23 @@ ```{asis, echo = {{xfer_time_knit & !xfer_time_user_knit & !xfer_time_drawn_knit & !xfer_time_threshold_knit & xfer_time_worldclim_knit}}, eval = {{xfer_time_knit & !xfer_time_user_knit & !xfer_time_drawn_knit & !xfer_time_threshold_knit & xfer_time_worldclim_knit}}, include = {{xfer_time_knit & !xfer_time_user_knit & !xfer_time_drawn_knit & !xfer_time_threshold_knit & xfer_time_worldclim_knit}}} ### Transfer model -Transferring the model to the same modelling area with no threshold rule. New time based on "{{envs_name_rmd}}" variables for {{yearMin_rmd}} using a "{{model_rmd}}" GCM and an RCP of *`r {{rcp_rmd}}/10`*. +Transferring the model to the same modelling area with no threshold rule. New time based on {{envs_name_rmd}} variables for {{yearMin_rmd}} using a {{model_rmd}} GCM and an SSP of {{rcp_rmd}}. ``` ```{r, echo = {{xfer_time_knit & !xfer_time_user_knit & !xfer_time_drawn_knit & !xfer_time_threshold_knit & xfer_time_worldclim_knit}}, include = {{xfer_time_knit & !xfer_time_user_knit & !xfer_time_drawn_knit & !xfer_time_threshold_knit & xfer_time_worldclim_knit}}} #Download variables for transferring -xferTimeEnvs_{{spAbr}} <- raster::getData( - 'CMIP5', +xferTimeEnvs_{{spAbr}} <- geodata::cmip6_world( + model = "{{model_rmd}}", + ssp = "{{rcp_rmd}}", + time = "{{year_rmd}}", var = "bio", res = round((raster::res(bgMask_{{spAbr}}) * 60)[1],1), - rcp = {{rcp_rmd}}, - model = "{{model_rmd}}", - year = {{year_rmd}}) + path = tempdir()) names(xferTimeEnvs_{{spAbr}}) <- paste0('bio', c(paste0('0',1:9), 10:19)) # Select variables for transferring to match variables used for modelling xferTimeEnvs_{{spAbr}} <- xferTimeEnvs_{{spAbr}}[[names(bgMask_{{spAbr}})]] +# Convert to rasterstack +xferTimeEnvs_{{spAbr}} <- raster::stack(xferTimeEnvs_{{spAbr}}) # Generate a transfer of the model to the desired area and time xfer_time_{{spAbr}} <-xfer_time( @@ -58,22 +60,24 @@ m %>% ```{asis, echo = {{xfer_time_knit & !xfer_time_user_knit & !xfer_time_drawn_knit & xfer_time_threshold_knit & xfer_time_worldclim_knit}}, eval = {{xfer_time_knit & !xfer_time_user_knit & !xfer_time_drawn_knit & xfer_time_threshold_knit & xfer_time_worldclim_knit}}, include = {{xfer_time_knit & !xfer_time_user_knit & !xfer_time_drawn_knit & xfer_time_threshold_knit & xfer_time_worldclim_knit}}} ### Transfer model -Transferring the model to the same modelling area with a "{{xfer_thresholdRule_rmd}}" threshold rule of {{xfer_threshold_rmd}}. New time based on "{{envs_name_rmd}}" variables for {{yearMin_rmd}} using a "{{model_rmd}}" GCM and an RCP of *`r {{rcp_rmd}}/10`*. +Transferring the model to the same modelling area with a "{{xfer_thresholdRule_rmd}}" threshold rule of {{xfer_threshold_rmd}}. New time based on {{envs_name_rmd}} variables for {{yearMin_rmd}} using a {{model_rmd}} GCM and an SSP of {{rcp_rmd}}. ``` ```{r, echo = {{xfer_time_knit & !xfer_time_user_knit & !xfer_time_drawn_knit & xfer_time_threshold_knit & xfer_time_worldclim_knit}}, include = {{xfer_time_knit & !xfer_time_user_knit & !xfer_time_drawn_knit & xfer_time_threshold_knit & xfer_time_worldclim_knit}}} #Download variables for transferring -xferTimeEnvs_{{spAbr}} <- raster::getData( - 'CMIP5', +xferTimeEnvs_{{spAbr}} <- geodata::cmip6_world( + model = "{{model_rmd}}", + ssp = "{{rcp_rmd}}", + time = "{{year_rmd}}", var = "bio", res = round((raster::res(bgMask_{{spAbr}}) * 60)[1],1), - rcp = {{rcp_rmd}}, - model = "{{model_rmd}}", - year = {{year_rmd}}) + path = tempdir()) names(xferTimeEnvs_{{spAbr}}) <- paste0('bio', c(paste0('0',1:9), 10:19)) # Select variables for transferring to match variables used for modelling xferTimeEnvs_{{spAbr}} <- xferTimeEnvs_{{spAbr}}[[names(bgMask_{{spAbr}})]] +# Convert to rasterstack +xferTimeEnvs_{{spAbr}} <- raster::stack(xferTimeEnvs_{{spAbr}}) # Generate a transfer of the model to the desired area and time xfer_time_{{spAbr}} <-xfer_time( @@ -126,22 +130,24 @@ m %>% ```{asis, echo = {{xfer_time_knit & !xfer_time_user_knit & xfer_time_drawn_knit & !xfer_time_threshold_knit & xfer_time_worldclim_knit}}, eval = {{xfer_time_knit & !xfer_time_user_knit & xfer_time_drawn_knit & !xfer_time_threshold_knit & xfer_time_worldclim_knit}}, include = {{xfer_time_knit & !xfer_time_user_knit & xfer_time_drawn_knit & !xfer_time_threshold_knit & xfer_time_worldclim_knit}}} ### Transfer model -Transferring the model to a user drawn area with no threshold. New time based on "{{envs_name_rmd}}" variables for {{yearMin_rmd}} using a "{{model_rmd}}" GCM and an RCP of *`r {{rcp_rmd}}/10`*. +Transferring the model to a user drawn area with no threshold. New time based on {{envs_name_rmd}} variables for {{yearMin_rmd}} using a {{model_rmd}} GCM and an SSP of {{rcp_rmd}}. ``` ```{r, echo = {{xfer_time_knit & !xfer_time_user_knit & xfer_time_drawn_knit & !xfer_time_threshold_knit & xfer_time_worldclim_knit}}, include = {{xfer_time_knit & !xfer_time_user_knit & xfer_time_drawn_knit & !xfer_time_threshold_knit & xfer_time_worldclim_knit}}} #Download variables for transferring -xferTimeEnvs_{{spAbr}} <- raster::getData( - 'CMIP5', +xferTimeEnvs_{{spAbr}} <- geodata::cmip6_world( + model = "{{model_rmd}}", + ssp = "{{rcp_rmd}}", + time = "{{year_rmd}}", var = "bio", res = round((raster::res(bgMask_{{spAbr}}) * 60)[1],1), - rcp = {{rcp_rmd}}, - model = "{{model_rmd}}", - year = {{year_rmd}}) + path = tempdir()) names(xferTimeEnvs_{{spAbr}}) <- paste0('bio', c(paste0('0',1:9), 10:19)) # Select variables for transferring to match variables used for modelling xferTimeEnvs_{{spAbr}} <- xferTimeEnvs_{{spAbr}}[[names(bgMask_{{spAbr}})]] +# Convert to rasterstack +xferTimeEnvs_{{spAbr}} <- raster::stack(xferTimeEnvs_{{spAbr}}) # Generate the area of transfer according to the drawn polygon in the GUI xfer_draw_{{spAbr}} <-xfer_draw( @@ -191,22 +197,24 @@ m %>% ```{asis, echo = {{xfer_time_knit & !xfer_time_user_knit & xfer_time_drawn_knit & xfer_time_threshold_knit & xfer_time_worldclim_knit}}, eval = {{xfer_time_knit & !xfer_time_user_knit & xfer_time_drawn_knit & xfer_time_threshold_knit & xfer_time_worldclim_knit}}, include = {{xfer_time_knit & !xfer_time_user_knit & xfer_time_drawn_knit & xfer_time_threshold_knit & xfer_time_worldclim_knit}}} ### Transfer model -Transferring the model to a user drawn area with a "{{xfer_thresholdRule_rmd}}" threshold rule of {{xfer_threshold_rmd}}. New time based on "{{envs_name_rmd}}" variables for {{yearMin_rmd}} using a "{{model_rmd}}" GCM and an RCP of *`r {{rcp_rmd}}/10`*. +Transferring the model to a user drawn area with a "{{xfer_thresholdRule_rmd}}" threshold rule of {{xfer_threshold_rmd}}. New time based on {{envs_name_rmd}} variables for {{yearMin_rmd}} using a {{model_rmd}} GCM and an SSP of {{rcp_rmd}}. ``` ```{r, echo = {{xfer_time_knit & !xfer_time_user_knit & xfer_time_drawn_knit & xfer_time_threshold_knit & xfer_time_worldclim_knit}}, include = {{xfer_time_knit & !xfer_time_user_knit & xfer_time_drawn_knit & xfer_time_threshold_knit & xfer_time_worldclim_knit}}} #Download variables for transferring -xferTimeEnvs_{{spAbr}} <- raster::getData( - 'CMIP5', - var = "bio", - res = round((raster::res(bgMask_{{spAbr}}) * 60)[1],1), - rcp = {{rcp_rmd}}, +xferTimeEnvs_{{spAbr}} <- geodata::cmip6_world( model = "{{model_rmd}}", - year = {{year_rmd}}) + ssp = "{{rcp_rmd}}", + time = "{{year_rmd}}", + var = "bio", + res = round((raster::res(bgMask_{{spAbr}}) * 60)[1],1), + path = tempdir()) names(xferTimeEnvs_{{spAbr}}) <- paste0('bio', c(paste0('0',1:9), 10:19)) # Select variables for transferring to match variables used for modelling xferTimeEnvs_{{spAbr}} <- xferTimeEnvs_{{spAbr}}[[names(bgMask_{{spAbr}})]] +# Convert to rasterstack +xferTimeEnvs_{{spAbr}} <- raster::stack(xferTimeEnvs_{{spAbr}}) # Generate the area of transfer according to the drawn polygon in the GUI xfer_draw_{{spAbr}} <-xfer_draw( @@ -264,24 +272,25 @@ m %>% ```{asis, echo = {{xfer_time_knit & xfer_time_user_knit & !xfer_time_drawn_knit & !xfer_time_threshold_knit & xfer_time_worldclim_knit}}, eval = {{xfer_time_knit & xfer_time_user_knit & !xfer_time_drawn_knit & !xfer_time_threshold_knit & xfer_time_worldclim_knit}}, include = {{xfer_time_knit & xfer_time_user_knit & !xfer_time_drawn_knit & !xfer_time_threshold_knit & xfer_time_worldclim_knit}}} ### Transfer model -Transferring the model to a user provided area area with no threshold. New time based on "{{envs_name_rmd}}" variables for {{yearMin_rmd}} using a "{{model_rmd}}" GCM and an RCP of *`r {{rcp_rmd}}/10`*. +Transferring the model to a user provided area area with no threshold. New time based on {{envs_name_rmd}} variables for {{yearMin_rmd}} using a {{model_rmd}} GCM and an SSP of {{rcp_rmd}}. ``` ```{r, echo = {{xfer_time_knit & xfer_time_user_knit & !xfer_time_drawn_knit & !xfer_time_threshold_knit & xfer_time_worldclim_knit}}, include = {{xfer_time_knit & xfer_time_user_knit & !xfer_time_drawn_knit & !xfer_time_threshold_knit & xfer_time_worldclim_knit}}} # Download variables for transferring -xferTimeEnvs_{{spAbr}} <- raster::getData( - 'CMIP5', - var = "bio", - res = round((raster::res(bgMask_{{spAbr}}) * 60)[1],1), - rcp = {{rcp_rmd}}, +xferTimeEnvs_{{spAbr}} <- geodata::cmip6_world( model = "{{model_rmd}}", - year = {{year_rmd}}) + ssp = "{{rcp_rmd}}", + time = "{{year_rmd}}", + var = "bio", + res = round((raster::res(bgMask_{{spAbr}}) * 60)[1],1), + path = tempdir()) names(xferTimeEnvs_{{spAbr}}) <- paste0('bio', c(paste0('0',1:9), 10:19)) - # Select variables for transferring to match variables used for modelling xferTimeEnvs_{{spAbr}} <- xferTimeEnvs_{{spAbr}}[[names(bgMask_{{spAbr}})]] +# Convert to rasterstack +xferTimeEnvs_{{spAbr}} <- raster::stack(xferTimeEnvs_{{spAbr}}) # Generate the area of transfer based on user provided files ##User must input the path to shapefile or csv file and the file name @@ -332,24 +341,25 @@ m %>% ```{asis, echo = {{xfer_time_knit & xfer_time_user_knit & !xfer_time_drawn_knit & xfer_time_threshold_knit & xfer_time_worldclim_knit}}, eval = {{xfer_time_knit & xfer_time_user_knit & !xfer_time_drawn_knit & xfer_time_threshold_knit & xfer_time_worldclim_knit}}, include = {{xfer_time_knit & xfer_time_user_knit & !xfer_time_drawn_knit & xfer_time_threshold_knit & xfer_time_worldclim_knit}}} ### Transfer model -Transferring the model to a user provided area with a "{{xfer_thresholdRule_rmd}}" threshold rule of {{xfer_threshold_rmd}}. New time based on "{{envs_name_rmd}}" variables for {{yearMin_rmd}} using a "{{model_rmd}}" GCM and an RCP of *`r {{rcp_rmd}}/10`*. +Transferring the model to a user provided area with a "{{xfer_thresholdRule_rmd}}" threshold rule of {{xfer_threshold_rmd}}. New time based on {{envs_name_rmd}} variables for {{yearMin_rmd}} using a {{model_rmd}} GCM and an SSP of {{rcp_rmd}}. ``` ```{r, echo = {{xfer_time_knit & xfer_time_user_knit & !xfer_time_drawn_knit & xfer_time_threshold_knit & xfer_time_worldclim_knit}}, include = {{xfer_time_knit & xfer_time_user_knit & !xfer_time_drawn_knit & xfer_time_threshold_knit & xfer_time_worldclim_knit}}} # Download variables for transferring from Worldclim -xferTimeEnvs_{{spAbr}} <- raster::getData( - 'CMIP5', - var = "bio", - res = round((raster::res(bgMask_{{spAbr}}) * 60)[1],1), - rcp = {{rcp_rmd}}, - model = "{{model_rmd}}", - year = {{year_rmd}}) +xferTimeEnvs_{{spAbr}} <- geodata::cmip6_world( + model = "{{model_rmd}}", + ssp = "{{rcp_rmd}}", + time = "{{year_rmd}}", + var = "bio", + res = round((raster::res(bgMask_{{spAbr}}) * 60)[1],1), + path = tempdir()) names(xferTimeEnvs_{{spAbr}}) <- paste0('bio', c(paste0('0',1:9), 10:19)) - # Select variables for transferring to match variables used for modelling xferTimeEnvs_{{spAbr}} <- xferTimeEnvs_{{spAbr}}[[names(bgMask_{{spAbr}})]] +# Convert to rasterstack +xferTimeEnvs_{{spAbr}} <- raster::stack(xferTimeEnvs_{{spAbr}}) # Generate the area of transfer based on user provided files ##User must input the path to shapefile or csv file and the file name diff --git a/inst/shiny/modules/xfer_time.md b/inst/shiny/modules/xfer_time.md index 06ab4144..9a16bbe5 100644 --- a/inst/shiny/modules/xfer_time.md +++ b/inst/shiny/modules/xfer_time.md @@ -4,16 +4,14 @@ In simple terms, applying or “transferring” a niche/distributional model to a region or time period different from the ones used to make the model involves making a prediction based on the model and the new values of the predictor variables. In reality, however, researchers should be cognizant of many possible pitfalls, including non-analog conditions (e.g., requiring extrapolation in environmental space; see **Component: Build and Evaluate Niche Model**) and heterogeneity in the effects of species interactions (Fitzpatrick and Hargrove 2009; Anderson 2013). -To predict to different times, datasets describing environmental variables in these times are needed. Global circulation models (GCMs) provide estimates for climate for both the past and future. Various GCMs may have disparate estimates because they are based on different assumptions. Wallace currently uses future climate data for 2050 and 2070 from the IPCC fifth assessment report (AR5) climate projections based on the user’s selection of WorldClim or ecoClimate source variables. The four Representative Concentration Pathways (RCPs) available (RCP2.6, RCP4.5, RCP6.0, and RCP8.5) span a range of climate change scenarios from different greenhouse gas emission outcomes. More information on climate change models can be found here (Hausfather 2019). - -NOTE: The IPCC sixth assessment report replaced the use of RCPs with Shared Socioeconomic Pathways (SSPs). The user should note that Wallace uses the terminology associated with AR5, but future versions, as well as other source material, may mention SSPs. +To predict to different times, datasets describing environmental variables in these times are needed. Global circulation models (GCMs) provide estimates for climate for both the past and future. Various GCMs may have disparate estimates because they are based on different assumptions. Wallace currently uses future climate data based on the user’s selection of WorldClim or ecoClimate source variables. For WorldClim, CMIP6 downscaled future climate projections are available via WorldClim v2.1. Some climate projections use the four Representative Concentration Pathways (RCPs) available (RCP2.6, RCP4.5, RCP6.0, and RCP8.5), which span a range of climate change scenarios from different greenhouse gas emission outcomes. Others use Shared Socio-economic Pathways (SSPs; 126, 245, 370 and 585). More information on climate change models can be found here (Hausfather 2019). **IMPLEMENTATION** -This module relies on functionality for model prediction grids from the R package `dismo` (Hijmans et al. 2020). +This module relies on functionality for model prediction grids from the R package `dismo` (Hijmans et al. 2020) and `geodata` for accessing climate data ((Hijmans et al. 2024). Users must first select a model. Depending on the ENMeval (Kass et al. 2021) settings selected in **Component: Build and Evaluate Niche Model**, there may be multiple choices for Maxent. For Step 1, users choose their study region. This is done by drawing a polygon, choosing to use the same extent as the model prediction, or uploading a polygon. The uploaded polygon must be a shapefile (include .shp, .shx, and .dbf) or a CSV file with field order (longitude, latitude). Once the study region has been delimited, “Create” chooses this extent for all transfer operations. -In Step 2, users must then select a time period to transfer and the source of variables (Worldclim or ecoClimate). The WorldClim option allows users to select a time period (year 2050 or 2070), and also a GCM and RCP that estimates the future climate. Using ecoClimate lets users select the Atmospheric Oceanic General Circulation Model and the temporal scenario (2080-2100 at different RCPs, Holocene, or LGM). +In Step 2, users must then select a time period to transfer and the source of variables (Worldclim or ecoClimate). The WorldClim option allows users to select a time period (year 2050 or 2070), and also a GCM and RCP that estimates the future climate. Note, three GCMs (FIO-ESM-2-0, GFDL-ESM4, & HadGEM3-GC31-LL) are excluded due to unavailibility for all SSP options. Using ecoClimate lets users select the Atmospheric Oceanic General Circulation Model and the temporal scenario (2080-2100 at different RCPs, Holocene, or LGM). “Transfer” calculates the modeled response for the predictor variable values for each cell of the selected extent and plots the prediction on the map. Users can download the prediction as either raster grid types for analysis (.asc, .grd and .tif), or as an image file (.png). @@ -30,5 +28,7 @@ Hausfather, Z. (2019). CMIP6: the next generation of climate models explained. C Hijmans, R.J., Phillips, S., Leathwick, J., & Elith, J. (2020). dismo: Species Distribution Modeling. R package version 1.3-3. CRAN +Hijmans, R.J., et al. (2024). geodata: Download Geographic Data. R package version 0.6-2. CRAN + Kass, J., Muscarella, R., Galante, P.J., Bohl, C.L., Pinilla-Buitrago, G.E., Boria, R.A., Soley-Guardia, M., & Anderson, R.P. (2021). ENMeval: Automated Tuning and Evaluations of Ecological Niche Models. R package version 2.0 CRAN diff --git a/inst/shiny/modules/xfer_time.yml b/inst/shiny/modules/xfer_time.yml index 9408ed7c..e35f9c0e 100644 --- a/inst/shiny/modules/xfer_time.yml +++ b/inst/shiny/modules/xfer_time.yml @@ -2,4 +2,4 @@ component: "xfer" short_name: "Transfer to New Time" long_name: "Transfer to New Time" authors: "Jamie M. Kass, Bruno Vilela, Gonzalo E. Pinilla-Buitrago, Bethany A. Johnson, Robert P. Anderson" -package: [dismo] +package: [geodata, dismo] From 76885f2afdf206444bff262779257c5cf1527d2c Mon Sep 17 00:00:00 2001 From: Bethany Johnson Date: Wed, 17 Jul 2024 14:24:50 -0400 Subject: [PATCH 11/14] trycatch for worldclim data --- NEWS.md | 1 + R/envs_worldclim.R | 28 ++++++++++++++++++++-------- inst/shiny/modules/xfer_time.R | 24 +++++++++++++++++------- 3 files changed, 38 insertions(+), 15 deletions(-) diff --git a/NEWS.md b/NEWS.md index 147a2320..47bb58b6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -8,6 +8,7 @@ wallace 2.1.3 - Fixed broken function to disable `xfer_time` when using `envs_userEnvs` - Replaced `raster::getdata` with `geodata` functions - WorldClim v2.1 bioclimatic variables now available for Envs & Xfer_time! +- Added tryCatch for querying worldclim data (envs_wc & xfer_time) wallace 2.1.2 ============= diff --git a/R/envs_worldclim.R b/R/envs_worldclim.R index 1564034e..77cad85b 100644 --- a/R/envs_worldclim.R +++ b/R/envs_worldclim.R @@ -68,16 +68,27 @@ envs_worldclim <- function(bcRes, bcSel, mapCntr, doBrick = FALSE, smartProgress(logger, message = "Retrieving WorldClim data...", { if (bcRes == 0.5) { - wcbc <- geodata::worldclim_tile(var = "bio", - lon = mapCntr[1], lat = mapCntr[2], - path = tempdir(), - version="2.1") + wcbc <- tryCatch(expr = geodata::worldclim_tile(var = "bio", + lon = mapCntr[1], lat = mapCntr[2], + path = tempdir(), + version="2.1"), + error = function(e) NULL) } else { - wcbc <- geodata::worldclim_global(var = "bio", - res = bcRes, - path = tempdir(), - version = "2.1") + wcbc <- tryCatch(expr = geodata::worldclim_global(var = "bio", + res = bcRes, + path = tempdir(), + version = "2.1"), + error= function(e) NULL) } + #trycatch error + if (is.null(wcbc)) { + logger %>% writeLog( + type = "error", + paste0("Unable to retrieve data from WorldClim. + Server may be down. + Please use User-Specified module instead.")) + return() + } else { # change names to bioXX names(wcbc) <- gsub(".*_", "bio", names(wcbc)) # change names if bio01 is bio1, and so forth @@ -86,6 +97,7 @@ envs_worldclim <- function(bcRes, bcSel, mapCntr, doBrick = FALSE, function(x) x[2]), sep = '0') names(wcbc)[i] <- editNames wcbc <- wcbc[[bcSel]] + } }) # convert from spatraster to raster diff --git a/inst/shiny/modules/xfer_time.R b/inst/shiny/modules/xfer_time.R index bce50933..dcde0dc7 100644 --- a/inst/shiny/modules/xfer_time.R +++ b/inst/shiny/modules/xfer_time.R @@ -364,20 +364,30 @@ xfer_time_module_server <- function(input, output, session, common) { input$selRCP, "..."), { #BAJ eventually add 'if (res > 30){, cmip6_world(), }else use{ cmip6_tile()} - xferTimeEnvs <- - geodata::cmip6_world(model = input$selGCM, - ssp = input$selRCP, - time = input$selTime, - var = "bio", - res = round(envsRes * 60, 1), - path=tempdir()) + xferTimeEnvs <- tryCatch(expr = geodata::cmip6_world(model = input$selGCM, + ssp = input$selRCP, + time = input$selTime, + var = "bio", + res = round(envsRes * 60, 1), + path=tempdir()), + error= function(e) NULL) #BAJ geodata::cmip6_tile(lon, lat, model, ssp, time, var, path) for 30arcsec tile + # trycatch error + if (is.null(xferTimeEnvs)) { + logger %>% writeLog( + type = "error", + paste0("Unable to retrieve data from WorldClim. + Server may be down. + Please use User-Specified module instead.")) + return() + } else { names(xferTimeEnvs) <- paste0('bio', c(paste0('0',1:9), 10:19)) # in case user subsetted bioclims xferTimeEnvs <- xferTimeEnvs[[names(envs())]] # convert spatraster to raster xferTimeEnvs <- raster::stack(xferTimeEnvs) + } } ) } else if (input$selTimeVar == 'ecoclimate') { From 57ec6fa8f6808668b647a7b1d995bec3034f4e09 Mon Sep 17 00:00:00 2001 From: Bethany Johnson Date: Wed, 17 Jul 2024 16:06:32 -0400 Subject: [PATCH 12/14] predictor variable bug fix in vis_responsePlot Rmd --- NEWS.md | 1 + inst/shiny/modules/vis_responsePlot.Rmd | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index 47bb58b6..3737810c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,7 @@ wallace 2.1.3 - Updated JK's email - Added model name (FC + RM) to file name when prediction downloaded - Fixed vis_responsePlot knitting to Rmd +- Fixed predictor variable bug in vis_responsePlot Rmd - Fixed NA value warning in userEnvs - Fixed broken function to disable `xfer_time` when using `envs_userEnvs` - Replaced `raster::getdata` with `geodata` functions diff --git a/inst/shiny/modules/vis_responsePlot.Rmd b/inst/shiny/modules/vis_responsePlot.Rmd index 58c3f4dd..82cecbd9 100644 --- a/inst/shiny/modules/vis_responsePlot.Rmd +++ b/inst/shiny/modules/vis_responsePlot.Rmd @@ -4,12 +4,16 @@ Visualize response curves from "{{alg_rmd}}" model. ``` ```{r, echo = {{vis_responsePlot_knit & vis_maxnet_knit}}, include = {{vis_responsePlot_knit & vis_maxnet_knit}}} +# Retrieve env variables +n <- mxNonzeroCoefs(model_{{spAbr}}@models[["{{curModel_rmd}}"]], "maxnet") + # Create response curves +for (i in n) { maxnet::response.plot( model_{{spAbr}}@models[["{{curModel_rmd}}"]], - v = names(bgMask_{{spAbr}}), + v = i, type = "cloglog") - +} ``` ```{asis, echo = {{vis_responsePlot_knit & !vis_maxnet_knit}}, eval = {{vis_responsePlot_knit & !vis_maxnet_knit}}, include = {{vis_responsePlot_knit & !vis_maxnet_knit}}} @@ -18,8 +22,13 @@ Visualize response curves from "{{alg_rmd}}" model. ``` ```{r, echo = {{vis_responsePlot_knit & !vis_maxnet_knit }}, include = {{vis_responsePlot_knit & !vis_maxnet_knit}}} +# Retrieve env variables +n <- mxNonzeroCoefs(model_{{spAbr}}@models[["{{curModel_rmd}}"]], "maxent.jar") + # Create response curves +for (i in n) { dismo::response( model_{{spAbr}}@models[["{{curModel_rmd}}"]], - var = names(bgMask_{{spAbr}})) + var = i) +} ``` From 104317c6081f79f8f5ca129fce58779980b9d502 Mon Sep 17 00:00:00 2001 From: Bethany Johnson Date: Thu, 18 Jul 2024 16:53:45 -0400 Subject: [PATCH 13/14] fixed warnings with tidyselect --- R/model_bioclim.R | 4 ++-- R/model_maxent.R | 4 ++-- R/occs_queryDb.R | 28 ++++++++++++++-------------- R/part_partitionOccs.R | 6 +++--- R/penvs_bgSample.R | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/R/model_bioclim.R b/R/model_bioclim.R index ac3499fa..84f9b35e 100644 --- a/R/model_bioclim.R +++ b/R/model_bioclim.R @@ -73,8 +73,8 @@ model_bioclim <- function(occs, bg, user.grp, bgMsk, logger = NULL, spN = NULL) { # get just coordinates - occs.xy <- occs %>% dplyr::select(.data$longitude, .data$latitude) - bg.xy <- bg %>% dplyr::select(.data$longitude, .data$latitude) + occs.xy <- occs %>% dplyr::select("longitude", "latitude") + bg.xy <- bg %>% dplyr::select("longitude", "latitude") smartProgress(logger, message = paste0("Building/Evaluating BIOCLIM model for ", diff --git a/R/model_maxent.R b/R/model_maxent.R index e7ec30c5..82a53b06 100644 --- a/R/model_maxent.R +++ b/R/model_maxent.R @@ -189,8 +189,8 @@ model_maxent <- function(occs, bg, user.grp, bgMsk, rms, rmsStep, fcs, } # get just coordinates - occs.xy <- occs %>% dplyr::select(.data$longitude, .data$latitude) - bg.xy <- bg %>% dplyr::select(.data$longitude, .data$latitude) + occs.xy <- occs %>% dplyr::select("longitude", "latitude") + bg.xy <- bg %>% dplyr::select("longitude", "latitude") # run ENMeval e <- ENMeval::ENMevaluate(occs = as.data.frame(occs.xy), bg = as.data.frame(bg.xy), diff --git a/R/occs_queryDb.R b/R/occs_queryDb.R index 0e5cea1f..712a8373 100644 --- a/R/occs_queryDb.R +++ b/R/occs_queryDb.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # occs_queryDb.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -259,12 +259,12 @@ occs_queryDb <- function(spNames, occDb, occNum = NULL, doCitations = FALSE, "institutionCode", "elevation", "coordinateUncertaintyInMeters") for (i in fields) if (!(i %in% names(occs))) occs[i] <- NA occs <- occs %>% - dplyr::rename(scientific_name = .data$name, - state_province = .data$stateProvince, - record_type = .data$basisOfRecord, - institution_code = .data$institutionCode, - catalog_number = .data$catalogNumber, - uncertainty = .data$coordinateUncertaintyInMeters) + dplyr::rename(scientific_name = "name", + state_province = "stateProvince", + record_type = "basisOfRecord", + institution_code = "institutionCode", + catalog_number = "catalogNumber", + uncertainty = "coordinateUncertaintyInMeters") } else if (occDb == 'vertnet') { # standardize VertNet column names fields <- c("name", "longitude", "latitude", "country", "stateprovince", @@ -273,13 +273,13 @@ occs_queryDb <- function(spNames, occDb, occNum = NULL, doCitations = FALSE, "coordinateuncertaintyinmeters") for (i in fields) if (!(i %in% names(occs))) occs[i] <- NA occs <- occs %>% - dplyr::rename(scientific_name = .data$name, - state_province = .data$stateprovince, - record_type = .data$basisofrecord, - institution_code = .data$institutioncode, - catalog_number = .data$catalognumber, - elevation = .data$maximumelevationinmeters, - uncertainty = .data$coordinateuncertaintyinmeters) + dplyr::rename(scientific_name = "name", + state_province = "stateprovince", + record_type = "basisofrecord", + institution_code = "institutioncode", + catalog_number = "catalognumber", + elevation = "maximumelevationinmeters", + uncertainty = "coordinateuncertaintyinmeters") # } else if (occDb == 'bison') { # standardize BISON column names # fields <- c("providedScientificName", "longitude", "latitude", "countryCode", # "stateProvince", "verbatimLocality", "year", "basisOfRecord", diff --git a/R/part_partitionOccs.R b/R/part_partitionOccs.R index 4fe048bd..17fff796 100644 --- a/R/part_partitionOccs.R +++ b/R/part_partitionOccs.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # part_partitionOccs.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -96,8 +96,8 @@ part_partitionOccs <- function(occs, bg, method, kfolds = NULL, bgMask = NULL, return() } - occs.xy <- occs %>% dplyr::select(.data$longitude, .data$latitude) - bg.xy <- bg %>% dplyr::select(.data$longitude, .data$latitude) + occs.xy <- occs %>% dplyr::select("longitude", "latitude") + bg.xy <- bg %>% dplyr::select("longitude", "latitude") if (method == 'jack') { group.data <- ENMeval::get.jackknife(occs.xy, bg.xy) diff --git a/R/penvs_bgSample.R b/R/penvs_bgSample.R index e23a426b..e16523ac 100644 --- a/R/penvs_bgSample.R +++ b/R/penvs_bgSample.R @@ -1,6 +1,6 @@ # Wallace EcoMod: a flexible platform for reproducible modeling of # species niches and distributions. -# +# # penvs_bgSample.R # File author: Wallace EcoMod Dev Team. 2023. # -------------------------------------------------------------------------- @@ -78,7 +78,7 @@ penvs_bgSample <- function(occs, bgMask, bgPtsNum, logger = NULL, spN = NULL) { smartProgress(logger, message = "Generating background points...", { bgXY <- dismo::randomPoints(bgMask, bgPtsNum) bgXY <- bgXY %>% as.data.frame() %>% - dplyr::select(longitude = .data$x, latitude = .data$y) + dplyr::select(longitude = "x", latitude = "y") bgNonNA <- raster::ncell(bgMask) - raster::freq(bgMask, value = NA)[[1]] }) bg.prop <- round(nrow(bgXY)/bgPtsNum, digits = 2) From 622e8a0714d780c8a4b7c27b0b7a944cbbf546b4 Mon Sep 17 00:00:00 2001 From: Bethany Johnson Date: Thu, 18 Jul 2024 16:54:00 -0400 Subject: [PATCH 14/14] team updates [v2.1.3] --- DESCRIPTION | 6 +++--- inst/shiny/Rmd/text_team.Rmd | 14 +++++++------- man/xfer_area.Rd | 2 ++ man/xfer_userEnvs.Rd | 2 ++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 82d35697..488c95dd 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: wallace Version: 2.1.3 -Date: 2024-07-09 +Date: 2024-07-18 Title: A Modular Platform for Reproducible Modeling of Species Niches and Distributions Description: The 'shiny' application Wallace is a modular platform for @@ -12,10 +12,10 @@ Description: The 'shiny' application Wallace is a modular platform for most package functionality can be found on the package's GitHub Pages website: . Authors@R: - c(person("Jamie M.", "Kass", email = "jamie.m.kass@gmail.com", role = "aut"), + c(person("Bethany A.", "Johnson", email = "bjohnso005@citymail.cuny.edu", role = "aut"), + person("Jamie M.", "Kass", email = "jamie.m.kass@gmail.com", role = "aut"), person("Gonzalo E.", "Pinilla-Buitrago", email = "gepinillab@gmail.com", role = "aut"), person("Andrea", "Paz", email = "paz.andreita@gmail.com", role = "aut"), - person("Bethany A.", "Johnson", email = "bjohnso005@citymail.cuny.edu", role = "aut"), person("Valentina", "Grisales-Betancur", email = "vgrisale@eafit.edu.co", role = "aut"), person("Dean", "Attali", email = "daattali@gmail.com", role = "aut"), person("Matthew E.", "Aiello-Lammens", email = "matt.lammens@gmail.com", role = "aut"), diff --git a/inst/shiny/Rmd/text_team.Rmd b/inst/shiny/Rmd/text_team.Rmd index 1b568a6c..f557af4e 100644 --- a/inst/shiny/Rmd/text_team.Rmd +++ b/inst/shiny/Rmd/text_team.Rmd @@ -8,14 +8,19 @@ output: html_document ## Developers +bethany + +Bethany A. Johnson (lead developer) received her MS in Biology from the City College of New York and is currently a Visiting Scientist at the Center for Biodiversity & Conservation at the American Museum of Natural History. +
+ jamie -Jamie M. Kass (co-lead developer) received his PhD at CUNY Graduate Center and City College of New York, did a Postdoc at Okinawa Institute of Science and Technology, and currently is Associate Professor at Tohoku University. +Jamie M. Kass (developer) received his PhD at CUNY Graduate Center and City College of New York, did a Postdoc at Okinawa Institute of Science and Technology, and currently is Associate Professor at Tohoku University.
gonzalo -Gonzalo E. Pinilla-Buitrago (co-lead developer) received his PhD from the CUNY Graduate Center and City College of New York. He is currently a Postdoctoral Researcher at University of Connecticut. +Gonzalo E. Pinilla-Buitrago (developer) received his PhD from the CUNY Graduate Center and City College of New York. He is currently a Postdoctoral Researcher at University of Connecticut.
andrea @@ -23,11 +28,6 @@ output: html_document Andrea Paz (developer) received her PhD at CUNY Graduate Center and City College of New York, after which she was a Postdoctoral Researcher at the Crowther Lab in ETH Zürich. She is now an Assistant Professor at the Biological Sciences Department, University of Montréal.
-bethany - -Bethany A. Johnson (developer) received her MS in Biology from the City College of New York and is currently a Visiting Scientist at the Center for Biodiversity & Conservation at the American Museum of Natural History. -
- dani Daniel López Lozano (developer) is a Biodiversity Informatics Specialist at the American Museum of Natural History's Center for Biodiversity & Conservation. diff --git a/man/xfer_area.Rd b/man/xfer_area.Rd index a8aa1863..2b651359 100644 --- a/man/xfer_area.Rd +++ b/man/xfer_area.Rd @@ -99,4 +99,6 @@ Jamie Kass Andrea Paz Gonzalo E. Pinilla-Buitrago + +Bethany A. Johnson } diff --git a/man/xfer_userEnvs.Rd b/man/xfer_userEnvs.Rd index 52c5fc7c..7f43385b 100644 --- a/man/xfer_userEnvs.Rd +++ b/man/xfer_userEnvs.Rd @@ -93,4 +93,6 @@ Jamie Kass Andrea Paz Gonzalo E. Pinilla-Buitrago + +Bethany A. Johnson }