From ec23393ee44d9ff571c9333f8e07137b6a0e2c52 Mon Sep 17 00:00:00 2001 From: Eva Rifa Date: Tue, 3 Oct 2023 11:23:00 +0200 Subject: [PATCH 1/3] Correct reordering in RainFARM --- R/CST_RainFARM.R | 5 ++--- vignettes/RainFARM_vignette.Rmd | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/R/CST_RainFARM.R b/R/CST_RainFARM.R index d01d9a1b..1335cbc8 100644 --- a/R/CST_RainFARM.R +++ b/R/CST_RainFARM.R @@ -355,9 +355,8 @@ RainFARM <- function(data, lon, lat, nf, weights = 1., nens = 1, slope = 0, names(cdim0)[-(1:ienspos)]), grep, names(dim(result))) ndim <- names(dim(result)) - result <- aperm(result, iorder) - # R < 3.2.3 compatibility fix - names(dim(result)) <- ndim[iorder] + pos <- match(ndim, names(iorder)) + result <- aperm(result, pos) if (drop_realization_dim) { cdim <- dim(result) diff --git a/vignettes/RainFARM_vignette.Rmd b/vignettes/RainFARM_vignette.Rmd index 28ab753d..0d8e2ff8 100644 --- a/vignettes/RainFARM_vignette.Rmd +++ b/vignettes/RainFARM_vignette.Rmd @@ -205,4 +205,3 @@ RainFARM creates an additional dimension in the `$data` array of the output data * Rebora, N., Ferraris, L., von Hardenberg, J., Provenzale, A. RainFARM: Rainfall downscaling by a filtered autoregressive model. J. Hydrometeor., 7, 724-738, doi:10.1175/JHM517.1 (2006b) * Ferraris, L., Gabellani, S., Parodi, U., Rebora, N., von Hardenberg, J., Provenzale, A. Revisiting multifractality in rainfall fields. J. Hydrometeor., 4, 544-551, doi:10.1175/ 1525-7541(2003)004,0544:RMIRF.2.0.CO;2 (2003a) * Ferraris, L., Gabellani, S., Rebora, N., and Provenzale, A.. A comparison of stochastic models for spatial rainfall downscaling, Water Resour. Res., 39, 1368, https://doi.org/10.1029/2003WR002504, (2003b) - -- GitLab From e60fda89dfc59e093ba55c6bd5bb13653f106f1c Mon Sep 17 00:00:00 2001 From: Eva Rifa Date: Tue, 3 Oct 2023 11:25:15 +0200 Subject: [PATCH 2/3] Resolve changes with master --- vignettes/RainFARM_vignette.Rmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vignettes/RainFARM_vignette.Rmd b/vignettes/RainFARM_vignette.Rmd index 0d8e2ff8..ea2a7f94 100644 --- a/vignettes/RainFARM_vignette.Rmd +++ b/vignettes/RainFARM_vignette.Rmd @@ -204,4 +204,4 @@ RainFARM creates an additional dimension in the `$data` array of the output data * Rebora, N., L. Ferraris, J. von Hardenberg, A. Provenzale. Rainfall downscaling and flood forecasting: A case study in the Mediterranean area. Nat. Hazards Earth Syst. Sci., 6, 611-619, doi:10.5194/nhess-6-611-2006 (2006a) * Rebora, N., Ferraris, L., von Hardenberg, J., Provenzale, A. RainFARM: Rainfall downscaling by a filtered autoregressive model. J. Hydrometeor., 7, 724-738, doi:10.1175/JHM517.1 (2006b) * Ferraris, L., Gabellani, S., Parodi, U., Rebora, N., von Hardenberg, J., Provenzale, A. Revisiting multifractality in rainfall fields. J. Hydrometeor., 4, 544-551, doi:10.1175/ 1525-7541(2003)004,0544:RMIRF.2.0.CO;2 (2003a) -* Ferraris, L., Gabellani, S., Rebora, N., and Provenzale, A.. A comparison of stochastic models for spatial rainfall downscaling, Water Resour. Res., 39, 1368, https://doi.org/10.1029/2003WR002504, (2003b) +* Ferraris, L., Gabellani, S., Rebora, N., and Provenzale, A.. A comparison of stochastic models for spatial rainfall downscaling, Water Resour. Res., 39, 1368, https://doi.org/10.1029/2003WR002504, (2003b) \ No newline at end of file -- GitLab From a0ca1738f16f77c3b65bc64456b72bcfe447d554 Mon Sep 17 00:00:00 2001 From: Eva Rifa Date: Tue, 3 Oct 2023 11:27:18 +0200 Subject: [PATCH 3/3] Return to master version of vignette, no changes --- vignettes/RainFARM_vignette.Rmd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vignettes/RainFARM_vignette.Rmd b/vignettes/RainFARM_vignette.Rmd index ea2a7f94..28ab753d 100644 --- a/vignettes/RainFARM_vignette.Rmd +++ b/vignettes/RainFARM_vignette.Rmd @@ -204,4 +204,5 @@ RainFARM creates an additional dimension in the `$data` array of the output data * Rebora, N., L. Ferraris, J. von Hardenberg, A. Provenzale. Rainfall downscaling and flood forecasting: A case study in the Mediterranean area. Nat. Hazards Earth Syst. Sci., 6, 611-619, doi:10.5194/nhess-6-611-2006 (2006a) * Rebora, N., Ferraris, L., von Hardenberg, J., Provenzale, A. RainFARM: Rainfall downscaling by a filtered autoregressive model. J. Hydrometeor., 7, 724-738, doi:10.1175/JHM517.1 (2006b) * Ferraris, L., Gabellani, S., Parodi, U., Rebora, N., von Hardenberg, J., Provenzale, A. Revisiting multifractality in rainfall fields. J. Hydrometeor., 4, 544-551, doi:10.1175/ 1525-7541(2003)004,0544:RMIRF.2.0.CO;2 (2003a) -* Ferraris, L., Gabellani, S., Rebora, N., and Provenzale, A.. A comparison of stochastic models for spatial rainfall downscaling, Water Resour. Res., 39, 1368, https://doi.org/10.1029/2003WR002504, (2003b) \ No newline at end of file +* Ferraris, L., Gabellani, S., Rebora, N., and Provenzale, A.. A comparison of stochastic models for spatial rainfall downscaling, Water Resour. Res., 39, 1368, https://doi.org/10.1029/2003WR002504, (2003b) + -- GitLab