Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix remaining check warnings and undeclared dependencies from PEcAn.utils #2830

Merged
merged 94 commits into from
Aug 31, 2021
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
6331608
Update DESCRIPTION
moki1202 Jul 30, 2021
5502ad5
Delete do_conversions.R
moki1202 Jul 30, 2021
2a00ca3
Delete run.write.configs.R
moki1202 Jul 30, 2021
2fdbaf4
Update convert.input.R
moki1202 Jul 30, 2021
4f35f19
Update read.output.R
moki1202 Jul 30, 2021
e16fada
Delete plots.R
moki1202 Jul 30, 2021
436f30a
Create plots.R
moki1202 Jul 30, 2021
b1a0083
Delete ensemble.R
moki1202 Jul 30, 2021
b4a9b06
Update get.results.R
moki1202 Jul 30, 2021
e93d1ab
Delete get.results.R
moki1202 Jul 30, 2021
9ea25de
Create get.results.R
moki1202 Jul 30, 2021
982ca44
years and yieldarray (No global variable)
moki1202 Jul 30, 2021
b703b89
Update mcmc.list2init.R
moki1202 Jul 30, 2021
3cf93a6
No global variable for runs.sample
moki1202 Jul 30, 2021
68b2b01
Update utils.R
moki1202 Jul 30, 2021
b9d5dca
\examples lines wider than 100 characters:
moki1202 Jul 30, 2021
6b886a0
Update convert.input.R
moki1202 Jul 30, 2021
53abf16
Update get.model.output.R
moki1202 Jul 30, 2021
bc59d5f
Update full.path.R
moki1202 Jul 30, 2021
e4ce8d6
Update r2bugs.distributions.R
moki1202 Jul 30, 2021
77053c3
Update sensitivity.R
moki1202 Jul 30, 2021
09ab925
Update utils.R
moki1202 Jul 30, 2021
b34a8d6
Update seconds_in_year.R
moki1202 Jul 30, 2021
a935065
automated documentation update
Jul 30, 2021
bfff5b2
Update utils.R
moki1202 Jul 30, 2021
34fe846
Update retry.func.Rd
moki1202 Jul 30, 2021
e5112c6
Update base/utils/DESCRIPTION
moki1202 Jul 31, 2021
d2c1f67
Update utils.R
moki1202 Aug 1, 2021
8121cab
Update get.analysis.filenames.r
moki1202 Aug 2, 2021
1207236
Update sensitivity.R
moki1202 Aug 2, 2021
e690e2c
automated documentation update
Aug 2, 2021
b57362f
Delete logger.R
moki1202 Aug 2, 2021
1562f47
Update get.analysis.filenames.r
moki1202 Aug 2, 2021
0514314
automated documentation update
Aug 2, 2021
a9bf9d9
Update utils.R
moki1202 Aug 3, 2021
e151c04
automated documentation update
Aug 3, 2021
308eee3
Update utils.R
moki1202 Aug 3, 2021
45295ab
automated documentation update
Aug 3, 2021
ddc2731
Update base/utils/R/convert.input.R
moki1202 Aug 4, 2021
a1e85f1
Update base/utils/R/convert.input.R
moki1202 Aug 4, 2021
e48b4ab
Update base/utils/R/convert.input.R
moki1202 Aug 4, 2021
63006c7
Update base/utils/R/get.analysis.filenames.r
moki1202 Aug 4, 2021
ea08fd5
Update base/utils/R/utils.R
moki1202 Aug 4, 2021
1cff4af
Update base/utils/R/utils.R
moki1202 Aug 4, 2021
cb1290d
Update base/utils/R/get.analysis.filenames.r
moki1202 Aug 4, 2021
b2f2c3f
Update base/utils/R/utils.R
moki1202 Aug 4, 2021
d0ca89a
Update base/utils/R/utils.R
moki1202 Aug 4, 2021
49a3801
Update base/utils/R/sensitivity.R
moki1202 Aug 4, 2021
f71acdf
Update base/utils/R/mcmc.list2init.R
moki1202 Aug 4, 2021
e6bf4e3
Update base/utils/R/r2bugs.distributions.R
moki1202 Aug 4, 2021
ce1ad65
Update base/utils/R/regrid.R
moki1202 Aug 4, 2021
1b77075
Update base/utils/R/regrid.R
moki1202 Aug 4, 2021
915b81f
Update base/utils/R/seconds_in_year.R
moki1202 Aug 4, 2021
1aabf4a
Update base/utils/R/get.analysis.filenames.r
moki1202 Aug 4, 2021
69c2481
Update base/utils/R/regrid.R
infotroph Aug 4, 2021
0a27ddf
automated documentation update
Aug 4, 2021
bdacaf4
Merge branch 'develop' into utils_to_CRAN
infotroph Aug 4, 2021
bbf94e7
more missing param defs
infotroph Aug 4, 2021
68dde2f
Merge pull request #2 from infotroph/utils_to_cran_cleanup
moki1202 Aug 4, 2021
00c5022
Rd files for moved functions
infotroph Aug 4, 2021
c3a1edf
Merge pull request #3 from infotroph/utils_to_cran_cleanup
moki1202 Aug 4, 2021
0baf810
Merge branch 'PecanProject:develop' into utils_to_CRAN
moki1202 Aug 10, 2021
6d3c07c
warning fix
Aug 10, 2021
87cc61b
Update utils.R
moki1202 Aug 12, 2021
39da229
Merge branch 'develop' into utils_to_CRAN
infotroph Aug 13, 2021
cfcec29
automated documentation update
Aug 13, 2021
170b701
Update base/utils/.Rbuildignore
infotroph Aug 13, 2021
dd2b0bb
set Roxygen to use Markdown in visualization
infotroph Aug 13, 2021
d00932a
Merge pull request #4 from infotroph/vizn_markdown_rox
moki1202 Aug 14, 2021
c5b8e42
Update plots.R
moki1202 Aug 14, 2021
8a2e40d
automated documentation update
Aug 14, 2021
3672356
Update base/utils/R/utils.R
infotroph Aug 27, 2021
c391aeb
Merge branch 'develop' into utils_to_CRAN
infotroph Aug 27, 2021
7b6a3ef
Update modules/priors/R/plots.R
moki1202 Aug 27, 2021
25f0967
automated documentation update
Aug 28, 2021
460318f
whitespace
infotroph Aug 28, 2021
0fa022b
remove unused color argument
infotroph Aug 28, 2021
f1288ba
add missing argument descriptions
infotroph Aug 28, 2021
9712c6d
percent escaping rules change when using markdown
infotroph Aug 28, 2021
f8b65b1
undefined globals warning
infotroph Aug 28, 2021
42bc858
ggplot2 is in Imports, can assume installed
infotroph Aug 28, 2021
378732a
missed rename of plot_data call
infotroph Aug 28, 2021
9c1f5ae
delete create.base.plot, replace with bare ggplot() call
infotroph Aug 28, 2021
4320216
no idea why this is newly failing in this branch
infotroph Aug 29, 2021
e253874
get.results imports settings
infotroph Aug 30, 2021
e9da48b
move sensitivity.filename and ensemble.filename to uncertainty
infotroph Aug 30, 2021
a7ae293
add namespaces to utils functions in moved code
infotroph Aug 30, 2021
1d79b97
ignore these warnings for now
infotroph Aug 30, 2021
a0e8ede
update depends
infotroph Aug 30, 2021
25ea80d
biocro needs to know where get.results moved
infotroph Aug 30, 2021
4e2d13e
Merge pull request #5 from infotroph/more-movetoviz-fixes
moki1202 Aug 31, 2021
77779f2
Merge branch 'develop' into utils_to_CRAN
infotroph Aug 31, 2021
11ea792
import was added for now-deleted fn
infotroph Aug 31, 2021
5c026bb
Update Makefile.depends
infotroph Aug 31, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 13 additions & 12 deletions base/utils/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
Package: PEcAn.utils
Type: Package
Title: PEcAn functions used for ecological forecasts and
reanalysis
Title: PEcAn Functions Used for Ecological Forecasts and
Reanalysis
Version: 1.7.1
Date: 2019-09-05
Authors@R: c(person("Mike","Dietze"),
person("David","LeBauer"),
person("Xiaohui", "Feng"),
person("Dan"," Wang"),
person("Carl", "Davidson"),
person("Rob","Kooper"),
person("Shawn", "Serbin"))
Author: David LeBauer, Mike Dietze, Xiaohui Feng, Dan Wang,
Carl Davidson, Rob Kooper, Shawn Serbin
Maintainer: David LeBauer <dlebauer@illinois.edu>
Authors@R: c(
person("Rob","Kooper", role = c("aut", "cre"),
moki1202 marked this conversation as resolved.
Show resolved Hide resolved
email = "kooper@illinois.edu"),
person("David","LeBauer", role = c("aut")),
person("Xiaohui", "Feng", role = c("aut")),
person("Dan"," Wang", role = c("aut")),
person("Carl", "Davidson", role = c("aut")),
person("Shawn", "Serbin", role = c("aut")),
person("Shashank", "Singh", role = c("aut")),
person("Chris", "Black", role = c("aut")),
person("University of Illinois, NCSA", role = c("cph")))
Description: The Predictive Ecosystem Carbon Analyzer
(PEcAn) is a scientific workflow management tool that
is designed to simplify the management of model
Expand Down
10 changes: 0 additions & 10 deletions base/utils/NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,19 @@ export(cf2doy)
export(clear.scratch)
export(convert.expr)
export(convert.input)
export(create.base.plot)
export(datetime2cf)
export(datetime2doy)
export(days_in_year)
export(distn.stats)
export(distn.table.stats)
export(do_conversions)
export(download.file)
export(download.url)
export(ensemble.filename)
export(full.path)
export(get.ensemble.inputs)
export(get.ensemble.samples)
export(get.model.output)
export(get.parameter.stat)
export(get.quantiles)
export(get.results)
export(get.run.id)
export(get.sa.sample.list)
export(get.sa.samples)
Expand All @@ -49,17 +45,12 @@ export(misc.convert)
export(mstmipvar)
export(n_leap_day)
export(paste.stats)
export(plot_data)
export(r2bugs.distributions)
export(read.ensemble.output)
export(read.output)
export(read.sa.output)
export(read_web_config)
export(retry.func)
export(rsync)
export(run.write.configs)
export(runModule.get.results)
export(runModule.run.write.configs)
export(seconds_in_year)
export(sendmail)
export(sensitivity.filename)
Expand All @@ -79,7 +70,6 @@ export(transformstats)
export(tryl)
export(units_are_equivalent)
export(vecpaste)
export(write.ensemble.configs)
export(write.sa.configs)
export(zero.truncate)
importFrom(PEcAn.logger,logger.debug)
Expand Down
6 changes: 4 additions & 2 deletions base/utils/R/convert.input.R
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
##' @param ensemble An integer representing the number of ensembles, or FALSE if it data product is not an ensemble.
##' @param ensemble_name If convert.input is being called iteratively for each ensemble, ensemble_name contains the identifying name/number for that ensemble.
##' @param ... Additional arguments, passed unchanged to \code{fcn}
##' @param dbparms list, settings$database info reqired for opening a connection to DB
moki1202 marked this conversation as resolved.
Show resolved Hide resolved
##'
##' @return A list of two BETY IDs (input.id, dbfile.id) identifying a pre-existing file if one was available, or a newly created file if not. Each id may be a vector of ids if the function is processing an entire ensemble at once.
##'
Expand Down Expand Up @@ -96,7 +97,7 @@ convert.input <-
mimetype, site.id, start_date, end_date))

# TODO see issue #18
Rbinary <- ifelse(!exists("settings") || is.null(settings$host$Rbinary),"R",settings$host$Rbinary)
Rbinary <- ifelse(!exists("settings") || is.null(.data$settings$host$Rbinary),"R",.data$settings$host$Rbinary)
moki1202 marked this conversation as resolved.
Show resolved Hide resolved

n <- nchar(outfolder)
if (substr(outfolder, n, n) != "/") {
Expand Down Expand Up @@ -168,7 +169,8 @@ convert.input <-
hostname = host$name,
exact.dates = TRUE,
pattern = filename_pattern)


id <- NULL
moki1202 marked this conversation as resolved.
Show resolved Hide resolved
if(nrow(existing.dbfile[[i]]) > 0) {
existing.input[[i]] <- PEcAn.DB::db.query(paste0("SELECT * FROM inputs WHERE id=", existing.dbfile[[i]]$container_id),con)

Expand Down
103 changes: 0 additions & 103 deletions base/utils/R/do_conversions.R

This file was deleted.