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

fixed some global variables in PEcAn.MA package #2965

Merged
merged 39 commits into from
Jul 20, 2022
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
1098a35
Cleared Some notes and warnings of PEcAn.MA package.
nanu1605 Jul 12, 2022
20e49b0
some changes in global variables.
nanu1605 Jul 12, 2022
7a89622
Binding variables locally to the function "pecan.ma.summary"
nanu1605 Jul 12, 2022
7e94677
Merge branch 'meta_analysis' of https://github.com/nanu1605/pecan int…
nanu1605 Jul 12, 2022
c874c0c
Update modules/meta.analysis/R/meta.analysis.summary.R
nanu1605 Jul 12, 2022
c885215
Update modules/meta.analysis/DESCRIPTION
nanu1605 Jul 12, 2022
df5c7a1
Update modules/meta.analysis/R/meta.analysis.R
nanu1605 Jul 12, 2022
4a37f07
Fixed undefined global function.
nanu1605 Jul 13, 2022
8304559
Resolved R2WinBUGS dependency.
nanu1605 Jul 13, 2022
aca2329
Changed Documentation.
nanu1605 Jul 13, 2022
9bcf367
Changed Documentation.
nanu1605 Jul 13, 2022
eb4ac88
Merge branch 'meta_analysis' of https://github.com/nanu1605/pecan int…
nanu1605 Jul 13, 2022
4f972ca
added ggplot2 to DESCRIPTION
nanu1605 Jul 13, 2022
c4c7827
Added ggplot2 in Suggests.
nanu1605 Jul 13, 2022
4933786
updated pecan.depends.R
nanu1605 Jul 15, 2022
bc37d10
Update modules/meta.analysis/R/meta.analysis.summary.R
nanu1605 Jul 16, 2022
7c3526f
changed Makefile.depends
nanu1605 Jul 16, 2022
8f331b2
minor changes
nanu1605 Jul 16, 2022
a4145e1
Fixed Vignette Warning
nanu1605 Jul 16, 2022
ddb1e44
minor changes
nanu1605 Jul 16, 2022
8ad821e
Update modules/meta.analysis/DESCRIPTION
nanu1605 Jul 16, 2022
95880de
Documented the runModule.run.meta.analysis function.
nanu1605 Jul 16, 2022
49905f5
fixed some global variables
nanu1605 Jul 17, 2022
57c8786
Fixed Global Variables
nanu1605 Jul 17, 2022
f5664d5
some suggested changes
nanu1605 Jul 18, 2022
67dc3e9
minor Changes
nanu1605 Jul 18, 2022
e1dda5f
Merge branch 'develop' into meta_analysis_global_variables
mdietze Jul 18, 2022
b7b6677
Update modules/meta.analysis/R/jagify.R
nanu1605 Jul 18, 2022
dbaded0
removed settings as global variable
nanu1605 Jul 18, 2022
75deb42
Rd file updated
nanu1605 Jul 18, 2022
59a1f23
Update meta.analysis.write.model.R
dlebauer Jul 18, 2022
059fe92
Update modules/meta.analysis/R/run.meta.analysis.R
nanu1605 Jul 19, 2022
5864625
Update modules/meta.analysis/R/run.meta.analysis.R
nanu1605 Jul 19, 2022
d7fc5f6
Update modules/meta.analysis/R/run.meta.analysis.R
nanu1605 Jul 19, 2022
7a89489
Update modules/meta.analysis/R/run.meta.analysis.R
nanu1605 Jul 19, 2022
56a0b7d
minor changes
nanu1605 Jul 19, 2022
765e2ad
requested changes
nanu1605 Jul 20, 2022
c20b60f
minor changes
nanu1605 Jul 20, 2022
43bd05f
Merge branch 'develop' into meta_analysis_global_variables
mdietze Jul 20, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/meta.analysis/R/run.meta.analysis.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# http://opensource.ncsa.illinois.edu/license.html
#-------------------------------------------------------------------------------

run.meta.analysis.pft <- function(pft, iterations, random = TRUE, threshold = 1.2, dbfiles, dbcon, use_ghs = TRUE, update) {
run.meta.analysis.pft <- function(pft, iterations, random = TRUE, threshold = 1.2, dbfiles, dbcon, use_ghs = TRUE, update = FALSE) {
# check to see if get.trait was executed
if (!file.exists(file.path(pft$outdir, "trait.data.Rdata")) ||
!file.exists(file.path(pft$outdir, "prior.distns.Rdata"))) {
Expand All @@ -18,7 +18,7 @@ run.meta.analysis.pft <- function(pft, iterations, random = TRUE, threshold = 1.
# check to see if run.meta.analysis can be skipped
if (file.exists(file.path(pft$outdir, "trait.mcmc.Rdata")) &&
file.exists(file.path(pft$outdir, "post.distns.Rdata")) &&
update == TRUE) {
update != TRUE) {
PEcAn.logger::logger.info("Assuming get.trait copied results already")
return(pft)
}
Expand Down Expand Up @@ -190,7 +190,7 @@ run.meta.analysis <- function(pfts, iterations, random = TRUE, threshold = 1.2,
dbcon <- PEcAn.DB::db.open(database)
on.exit(PEcAn.DB::db.close(dbcon), add = TRUE)

result <- lapply(pfts, run.meta.analysis.pft, iterations = iterations, random = random,
result <- lapply(pfts, run.meta.analysis.pft(update = settings$meta.analysis$update), iterations = iterations, random = random,
mdietze marked this conversation as resolved.
Show resolved Hide resolved
threshold = threshold, dbfiles = dbfiles, dbcon = dbcon, use_ghs = use_ghs)
} # run.meta.analysis.R
## ==================================================================================================#
Expand Down