Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
4ac829f
also accept sf pts object
dlebauer Feb 3, 2025
be310eb
update CHANGELOG.md
dlebauer Feb 3, 2025
c5ae7dc
changed SDA downscale argument names to match new functionality
dlebauer Feb 4, 2025
db36719
make document
dlebauer Feb 4, 2025
6ec8c14
merge upstream develop; resolve changelog conflict
dlebauer Feb 4, 2025
fa087c2
Update modules/assim.sequential/R/downscale_function.R
dlebauer Feb 4, 2025
da96331
SDA_downscale_preprocess now expects Date objects,
dlebauer Feb 5, 2025
7041d18
update SDA downscale docs
dlebauer Feb 5, 2025
6af65d9
remove deprecated date handling
dlebauer Feb 12, 2025
3411085
Update modules/assim.sequential/R/downscale_function.R
dlebauer Feb 13, 2025
e4ca8a6
Refactoring and debugging SDA_downscale_preprocess; update test cases
dlebauer Feb 19, 2025
978254a
merge
dlebauer Mar 14, 2025
4f3ff5b
Merge branch 'develop' into ensemble_downscaling
dlebauer Mar 18, 2025
e00da0a
add refactored ensemble_downscale function derived from SDA_downscale…
dlebauer Mar 18, 2025
44bcddc
reverted original downscale_funciton.R so it doesn't conflict with #3451
dlebauer Mar 18, 2025
f53eef0
Merge branch 'ensemble_downscaling' of github.com:dlebauer/pecan into…
dlebauer Mar 18, 2025
0211780
Update CHANGELOG.md
dlebauer Mar 18, 2025
6eee5ac
restore refactored SDA_downscale function
dlebauer Mar 18, 2025
07daf1c
Merge branch 'ensemble_downscaling' of github.com:dlebauer/pecan into…
dlebauer Mar 18, 2025
b33a161
fix borked find and replace
dlebauer Mar 21, 2025
307228f
update documentation
dlebauer Mar 21, 2025
019afe4
revised ensemble downscale
dlebauer Mar 21, 2025
bc202e0
export subset_ensemble and ensemble_downscale functions
dlebauer Mar 21, 2025
0d6fa01
update metrics function
dlebauer Mar 21, 2025
e7655e2
Merge branch 'develop' of github.com:pecanproject/pecan into ensemble…
dlebauer Mar 21, 2025
01def9a
explicitly export outlier.etector.boxplot so it isn't interpreted as …
dlebauer Mar 21, 2025
ecd4ff1
Merge branch 'main' of github.com:pecanproject/pecan into ensemble_do…
dlebauer May 29, 2025
29ab4d2
increased logging and set seed in future_map for ensemble_downscale f…
dlebauer May 30, 2025
0310d65
replace randomForest with ranger in ensemble_downscale for speed and …
dlebauer May 30, 2025
0309308
update downscale_metrics function
dlebauer Jun 9, 2025
b268ece
merge
dlebauer Sep 15, 2025
bddbc99
Refactor ensemble_downscale function for improved clarity and error h…
dlebauer Sep 18, 2025
8235d54
Merge branch 'develop' into ensemble_downscaling
infotroph Sep 22, 2025
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ section for the next release.
- maespa did not compile with new fortran compiler
- updated github action to build docker images
- PEcAn.SIPNET now accepts relative paths in its input XML (#3418). Previously all files referenced in the autogenerated `job.sh` needed to be specified as absolute paths.
- Refactored and created new version of `SDA_downscale` named `ensemble_downscale`.
- Added helper function `.convert_coords_to_sf()` for consistent conversion of data with lat lon data to `sf` pts.
Comment on lines +68 to +69
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nits:

  • refactors seem like belong in "changed" not "fixed"
  • internal helper functions don't need to be mentioned in the changelog (and I'd argue it's confusing to do so, since the point is for users to not know or care about them)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also: Need to move up to "unlreased" (this section is now for already-tagged 1.9.0)

- R version 4.4 installs Python 3.12 which wants to leverage os managed packages instead, install python3-pika using apt.

### Changed
Expand Down
6 changes: 4 additions & 2 deletions modules/assim.sequential/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ Suggests:
ggrepel,
glue,
ggpubr,
ggrepel,
gridExtra,
keras3 (>= 1.0.0),
itertools,
magic (>= 1.5.0),
methods,
Expand All @@ -53,18 +55,18 @@ Suggests:
plotrix,
plyr (>= 1.8.4),
randomForest,
keras3 (>= 1.0.0),
ranger,
raster,
readr,
reshape2 (>= 1.4.2),
rlist,
sf,
sp,
stats,
terra,
testthat,
tictoc,
tidyr,
sp,
utils,
xgboost,
XML
Expand Down
3 changes: 3 additions & 0 deletions modules/assim.sequential/NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ export(assessParams)
export(block_matrix)
export(conj_wt_wishart_sampler)
export(construct_nimble_H)
export(downscale_metrics)
export(downscale_qsub_main)
export(dwtmnorm)
export(ensemble_downscale)
export(get_ensemble_weights)
export(hop_test)
export(interactive.plotting.sda)
Expand Down Expand Up @@ -60,6 +62,7 @@ export(sda.enkf_local)
export(sda_assemble)
export(sda_weights_site)
export(simple.local)
export(subset_ensemble)
export(stack_covariates_2_geotiff)
export(tobit.model)
export(tobit2space.model)
Expand Down
4 changes: 2 additions & 2 deletions modules/assim.sequential/R/Helper.functions.R
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
#' @description This function performs a simple outlier replacement on all the columns of dataframes inside a list
#' @return A list the same dimension as X, with each column of each dataframe
#' modified by replacing outlier points with the column median
#' @export
#' @export outlier.detector.boxplot
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I bet this is trying to prevent this name being treated as an S3 method, but I recommend renaming the function instead. Life's too short to fight with R about this.

#' @importFrom magrittr %>%
#'
outlier.detector.boxplot<-function(X) {
outlier.detector.boxplot <- function(X) {
X <- X %>%
purrr::map(function(X.tmp){
#X.tmp is all the state variables for each element of the list (site)
Expand Down
Loading
Loading