diff --git a/.Rbuildignore b/.Rbuildignore index 15222c0c49a1e16886a535ce490d47940170e23c..31cdda424dd02966ebb9f5f9ee8c1caa31ee008e 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,5 +1,6 @@ .*\.git$ .*\.gitignore$ +.*\.gitlab$ .*\.tar.gz$ .*\.pdf$ ./.nc$ @@ -7,8 +8,8 @@ .*\.gitlab-ci.yml$ ^tests$ #^inst/doc$ -^inst/doc/UseCase2_PrecipitationDownscaling_RainFARM_RF100\.R$ -^inst/doc/UseCase1_WindEvent_March2018\.R$ -^inst/doc/UseCase2_PrecipitationDownscaling_RainFARM_RF4\.R$ -^inst/doc/UseCase3_data_preparation_SCHEME_model\.R$ -^inst/doc/launch_UseCase2_PrecipitationDownscaling_RF4\.sh$ +^inst/doc/usecase/UseCase2_PrecipitationDownscaling_RainFARM_RF100\.R$ +^inst/doc/usecase/UseCase1_WindEvent_March2018\.R$ +^inst/doc/usecase/UseCase2_PrecipitationDownscaling_RainFARM_RF4\.R$ +^inst/doc/usecase/UseCase3_data_preparation_SCHEME_model\.R$ +^inst/doc/usecase/launch_UseCase2_PrecipitationDownscaling_RF4\.sh$ diff --git a/DESCRIPTION b/DESCRIPTION index 980023c21949a7a77b7a3880569eab95a97aafc2..14cd34f6f7fac882ba03cd00ef5579e04ffbbaf3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: CSTools Title: Assessing Skill of Climate Forecasts on Seasonal-to-Decadal Timescales -Version: 5.0.1 +Version: 5.1.0 Authors@R: c( person("Nuria", "Perez-Zanon", , "nuria.perez@bsc.es", role = "aut", comment = c(ORCID = "0000-0001-8568-3071")), person("Louis-Philippe", "Caron", , "louis-philippe.caron@bsc.es", role = "aut", comment = c(ORCID = "0000-0001-5221-0147")), diff --git a/NEWS.md b/NEWS.md index 5474779afe4fcc46415e9906c5c974e2628e4580..f2f8f099299897223878854151e8e11bc24852d9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,25 +1,48 @@ +# CSTools 5.1.0 (Release date: 17-10-2023) + +### Fixes +- Calibration() show warnings in atomic function when multiple cores are used. +- PlotForecastPDF fix background color in different machines. +- Correct CST_Subset indices for metadata. +- CST_Analogs: Add sdate_dim parameter and improve initial checks. +- Remove CST_Anomaly repeated checks in order to accept no member dimensions in obs. +- CST_SaveExp developments: improve warning, save metadata correctly. +- Improve print method in order that time_bounds are correctly displayed. + +### Development +- PlotWeeklyClim to allow years outside the reference period. +- PlotWeeklyClim to allow setting y limits. +- New function CST_Start(). +- PlotCombinedMap() has upper triangle_end; the color bars can have different breaks. +- New print method. +- CST_MultiEOF development treat spatial NAs. +- Correct PlotCombinedMap error. +- Substitute mentions of CST_Load by CST_Start. +- Modify necessary vignettes to the use of CST_Start. + # CSTools 5.0.1 (Release date: 06-06-2023) - Resubmit to CRAN because it was archived due to dependency issue -**Fixes** +### Fixes - Standardize the coordinates of 's2dv_cube' by setting the coordinates to vectors with NULL dimensions - Include a check for SaveExp output filenames that only contain date information - In SaveExp the dates parameter is allowed to have additional time dimensions of length 1 - Removed dot from the internal function named mergedatasets() used in CST_CategoricalEnsCombination -**New Features** +### Development - New parameter 'startdates' in CST_SaveExp used to manually decide the name of the output files -**Other** +### Other - Switch to testthat version 3 # CSTools 5.0.0 (Release date: 05-04-2023) -**Fixes** + +### Fixes - Correct vignettes: Analogs, MultiModelSkill and MultivarRMSE - Add 'ncores' to s2dv function calls in CST_Anomaly - Reduce computing time of examples and tests and improve documentation -**New features** +### Development - Add dat_dim parameter in CST_BiasCorrection and CST_Calibration - New plotting function for case studies temporal visualisation: PlotWeeklyClim - Deprecate indices in dim_anom parameter of CST_Anomaly @@ -31,26 +54,28 @@ - New color set in PlotForecastPDF Vitigeoss colors - New function CST_InsertDim -**Other** +### Other - Added contribution from ArticXchange project due to PlotWeeklyClim - Update NEWS.md with the correct format - Change Licence # CSTools 4.1.1 (Release date: 10-11-2022) -**Fixes** + +### Fixes - CST_Analogs corrected input of ClimProjDiags::Subset() - PlotCombinedMap corrected use of 'cex_bar_titles' parameter - CST_Anomaly added 'memb_dim', 'dat_dim' and 'ftime_dim' and improved use for 'dim_anom' parameters -# CSTools 4.1.0 (Release date: 25-10-2022) -**New features** +# CSTools 4.1.0 (Release date: 25-10-2022) + +### Development - Dependency on package 's2dverification' is changed to 's2dv' - CST_BiasCorrection new parameters 'memb_dim', 'sdate_dim', 'ncores' - CST_Calibration is able to calibrate forecast with new parameter 'exp_cor' - CST_QuantileMapping uses cross-validation and provides option to remove NAs; new parameters 'memb_dim', 'sdate_dim', 'window_dim' and 'na.rm'; 'sample_dim' and 'sample_length' are removed - s2dv_cube() new parameter 'time_dim' -**Fixes** +### Fixes - as.s2dv_cube() detects latitude and longitude structure in startR_array object - Data correction: 'lonlat_data' is renamed to 'lonlat_temp'; 'lonlat_prec' is corrected by one-day shift - Typo and parameter correction in vignette 'MostLikelyTercile_vignette' @@ -58,20 +83,22 @@ - PlotMostLikelyQuantileMap() works with s2dv::PlotLayout # CSTools 4.0.1 (Release date: 05-10-2021) -**New features** + +### Development - Dynamical Bias Correction method: `CST_ProxiesAttractors` and `CST_DynBiasCorrection` (optionally `Predictability`) - CST_BiasCorrection and BiasCorrection allows to calibrate a forecast given the calibration in the hindcast by using parameter 'exp_cor' - Use cases - CST_SaveExp includes parameter extra_string - PlotCombinedMap includes parameter cex_bar_titles -**Fixes** +### Fixes - Calibration retains correlation absolute value - Calibration fixed when cal.methodi == rpc-based, apply_to == sign, eval.method == 'leave-one-out' and the correlation is not significant - PlotMostLikelyQuantileMap reoder latitudes of an array provided in 'dots' parameter # CSTools 4.0.0 (Release date: 23-02-2021) -**New features** + +### Development - ADAMONT downscaling method: requires CST_AdamontAnalogs and CST_AdamontQQCor functions - Analogs method using Predictors: requires training_analogs and CST_AnalogsPredictors - PlotPDFsOLE includes parameters to modify legend style @@ -88,7 +115,7 @@ - Analogs vignette - Data Storage and retrieval vignette -**Fixes** +### Fixes - PlotForecastPDF correctly displays terciles labels - CST_SaveExp correctly save time units - CST_SplitDims returns ordered output following ascending order provided in indices when it is numeric @@ -100,7 +127,8 @@ - Decrease package size compresing vignettes figures and removing areave_data sample # CSTools 3.1.0 (Release date: 02-07-2020) -**New features** + +### Development - EnsClustering vignette - EnsClustering has a new parameter 'time_dim' - CST_BiasCorrection has na.rm paramter @@ -111,7 +139,7 @@ - CST_RFTemp/RF_Temp functions available for downscaling temperature - Weather Regimes vignette -**Fixes** +### Fixes - CST_Anomaly handles exp, obs or both - PlotForecastPDF vignette displays figures correctly - Calibration function is exposed to users @@ -123,17 +151,19 @@ - CST_SaveExp uses multiApply and save time dimension correctly # CSTools 3.0.0 (Release date: 10-02-2020) -**New features** + +### Development - CST_MergeDims and MergeDims - Version working with R 3.4.2 - PlotForecastPDF handles independent terciles, extremes and observations for each panel -**Fixes** +### Fixes - CST_Calibration handles missing values - BEI functions handle missing values -# CSTools 2.0.0 (Release date: 25-11-2019) -**New features** +# CSTools 2.0.0 (Release date: 25-11-2019) + +### Development - CST_Analogs Analogs downscaling method, - CST_MultiEOFS for multiple variables, - Ensemble Clustering, @@ -151,13 +181,14 @@ - Adding reference to S2S4E H2020 project into the DESCRIPTION file - Adding NEWS.md file -**Fixes** +### Fixes - Minor fix in CST_BiasCorrection when checking parameter 'obs' - Minor fix in data lonlat_prec to be of class 's2dv_cube' - Minor fix in RainFARM vignette ### CSTools 1.0.1 (Release date: 19-06-2019) -**Fixes and new features** + +### Fixes and development - Correcting test of PlotForecastPDF for compatibility with ggplot2 release - New function PlotCombinedMap - Adding reference to MEDSCOPE ERA4CS Project into the DESCRIPTION file diff --git a/R/CST_RFTemp.R b/R/CST_RFTemp.R index 1bf7ecdeedab5eed1078f395e120d17d47b31997..d8c9e138df48465e7613f5d42ad1e45e9c5da515 100644 --- a/R/CST_RFTemp.R +++ b/R/CST_RFTemp.R @@ -144,7 +144,7 @@ CST_RFTemp <- function(data, oro, xlim = NULL, ylim = NULL, lapse = 6.5, #'The output grid can be irregularly spaced in lon and/or lat. #'@references Method described in ERA4CS MEDSCOPE milestone M3.2: #'High-quality climate prediction data available to WP4 here: -#'\ url{https://www.medscope-project.eu/the-project/deliverables-reports/} +#'\url{https://www.medscope-project.eu/the-project/deliverables-reports/} #'and in H2020 ECOPOTENTIAL Deliverable No. 8.1: #'High resolution (1-10 km) climate, land use and ocean change scenarios here: #'\url{https://ec.europa.eu/research/participants/documents/downloadPublic?documentIds=080166e5b6cd2324&appId=PPGMS}. diff --git a/R/PlotCombinedMap.R b/R/PlotCombinedMap.R index 8e27f21f96ad058477504f9bc965a5e509454ad5..5c88babbb37df4486106d6a4b5e0b87aea397541 100644 --- a/R/PlotCombinedMap.R +++ b/R/PlotCombinedMap.R @@ -35,6 +35,35 @@ #' colour bar will be automatically interpolated to match the number of breaks. #' Each item in this list can be named, and the name will be used as title for #' the corresponding colour bar (equivalent to the parameter 'bar_titles'). +#'@param bar_limits Parameter from s2dv::ColorBar. Vector of two numeric values +#' with the extremes of the range of values represented in the colour bar. If +#' 'var_limits' go beyond this interval, the drawing of triangle extremes is +#' triggered at the corresponding sides, painted in 'col_inf' and 'col_sup'. +#' Either of them can be set as NA and will then take as value the +#' corresponding extreme in 'var_limits' (hence a triangle end won't be +#' triggered for these sides). Takes as default the extremes of 'brks' if +#' available, else the same values as 'var_limits'. +#'@param triangle_ends Parameter from s2dv::ColorBar. Vector of two logical +#' elements, indicating whether to force the drawing of triangle ends at each +#' of the extremes of the colour bar. This choice is automatically made from +#' the provided 'brks', 'bar_limits', 'var_limits', 'col_inf' and 'col_sup', +#' but the behaviour can be manually forced to draw or not to draw the triangle +#' ends with this parameter. If 'cols' is provided, 'col_inf' and 'col_sup' +#' will take priority over 'triangle_ends' when deciding whether to draw the +#' triangle ends or not. +#'@param col_inf Parameter from s2dv::ColorBar. Colour to fill the inferior +#' triangle end with. Useful if specifying colours manually with parameter +#' 'cols', to specify the colour and to trigger the drawing of the lower +#' extreme triangle, or if 'cols' is not specified, to replace the colour +#' automatically generated by ColorBar(). +#'@param col_sup Parameter from s2dv::ColorBar. Colour to fill the superior +#' triangle end with. Useful if specifying colours manually with parameter +#' 'cols', to specify the colour and to trigger the drawing of the upper +#' extreme triangle, or if 'cols' is not specified, to replace the colour +#' automatically generated by ColorBar(). +#'@param bar_extra_margin Parameter from s2dv::ColorBar. Extra margins to be +#' added around the colour bar, in the format c(y1, x1, y2, x2). The units are +#' margin lines. Takes rep(0, 4) by default. #'@param col_unknown_map Colour to use to paint the grid cells for which a map #' is not possible to be chosen according to 'map_select_fun' or for those #' values that go beyond 'display_range'. Takes the value 'white' by default. diff --git a/R/PlotPDFsOLE.R b/R/PlotPDFsOLE.R index bf95abb76c745410447d0cdf59c22f34b2509231..2d1447defbcbb9d1b71b14d5f92b02f645b0d6f0 100644 --- a/R/PlotPDFsOLE.R +++ b/R/PlotPDFsOLE.R @@ -1,7 +1,7 @@ #'Plotting two probability density gaussian functions and the optimal linear #'estimation (OLE) as result of combining them. #' -#'@author Eroteida Sanchez-Garcia - AEMET, //email{esanchezg@aemet.es} +#'@author Eroteida Sanchez-Garcia - AEMET, \email{esanchezg@aemet.es} #' #'@description This function plots two probability density gaussian functions #'and the optimal linear estimation (OLE) as result of combining them. diff --git a/R/Predictability.R b/R/Predictability.R index 680666df92b5c779e79c7488f5d6906672f88eb3..d43a20a02eeb2579c44f5e069db7c721f2f81ae3 100644 --- a/R/Predictability.R +++ b/R/Predictability.R @@ -29,21 +29,22 @@ #'@param ncores The number of cores to use in parallel computation. #' #'@return A list of length 2: -#' \itemize{ -#' \item\code{pred.dim} {a list of two lists 'qdim' and 'pos.d'. The 'qdim' list -#'contains values of local dimension 'dim' divided by terciles: -#'d1: lower tercile (high predictability), -#'d2: middle tercile, -#'d3: higher tercile (low predictability) -#'The 'pos.d' list contains the position of each tercile in parameter 'dim'} -#' -#' \item\code{pred.theta} {a list of two lists 'qtheta' and 'pos.t'. -#'The 'qtheta' list contains values of the inverse of persistence 'theta' -#'divided by terciles: -#'th1: lower tercile (high predictability), -#'th2: middle tercile, -#'th3: higher tercile (low predictability) -#'The 'pos.t' list contains the position of each tercile in parameter 'theta'} +#'\itemize{ +#' \item{'pred.dim', a list of two lists 'qdim' and 'pos.d'. The 'qdim' list +#' contains values of local dimension 'dim' divided by terciles: +#' d1: lower tercile (high predictability), +#' d2: middle tercile, +#' d3: higher tercile (low predictability) +#' The 'pos.d' list contains the position of each tercile in parameter +#' 'dim'.} +#'\item{'pred.theta', a list of two lists 'qtheta' and 'pos.t'. +#' The 'qtheta' list contains values of the inverse of persistence 'theta' +#' divided by terciles: +#' th1: lower tercile (high predictability), +#' th2: middle tercile, +#' th3: higher tercile (low predictability) +#' The 'pos.t' list contains the position of each tercile in parameter +#' 'theta'.} #'} #'@return dyn_scores values from 0 to 1. A dyn_score of 1 indicates the highest #'predictability. diff --git a/man/PlotCombinedMap.Rd b/man/PlotCombinedMap.Rd index c734f716a08bb611540132f551da3d67e0f66162..452c24f28e1820bdcdaae1bb5015a4f961ac4816 100644 --- a/man/PlotCombinedMap.Rd +++ b/man/PlotCombinedMap.Rd @@ -73,6 +73,36 @@ colour bar will be automatically interpolated to match the number of breaks. Each item in this list can be named, and the name will be used as title for the corresponding colour bar (equivalent to the parameter 'bar_titles').} +\item{bar_limits}{Parameter from s2dv::ColorBar. Vector of two numeric values +with the extremes of the range of values represented in the colour bar. If +'var_limits' go beyond this interval, the drawing of triangle extremes is +triggered at the corresponding sides, painted in 'col_inf' and 'col_sup'. +Either of them can be set as NA and will then take as value the +corresponding extreme in 'var_limits' (hence a triangle end won't be +triggered for these sides). Takes as default the extremes of 'brks' if +available, else the same values as 'var_limits'.} + +\item{triangle_ends}{Parameter from s2dv::ColorBar. Vector of two logical +elements, indicating whether to force the drawing of triangle ends at each +of the extremes of the colour bar. This choice is automatically made from +the provided 'brks', 'bar_limits', 'var_limits', 'col_inf' and 'col_sup', +but the behaviour can be manually forced to draw or not to draw the triangle +ends with this parameter. If 'cols' is provided, 'col_inf' and 'col_sup' +will take priority over 'triangle_ends' when deciding whether to draw the +triangle ends or not.} + +\item{col_inf}{Parameter from s2dv::ColorBar. Colour to fill the inferior +triangle end with. Useful if specifying colours manually with parameter +'cols', to specify the colour and to trigger the drawing of the lower +extreme triangle, or if 'cols' is not specified, to replace the colour +automatically generated by ColorBar().} + +\item{col_sup}{Parameter from s2dv::ColorBar. Colour to fill the superior +triangle end with. Useful if specifying colours manually with parameter +'cols', to specify the colour and to trigger the drawing of the upper +extreme triangle, or if 'cols' is not specified, to replace the colour +automatically generated by ColorBar().} + \item{col_unknown_map}{Colour to use to paint the grid cells for which a map is not possible to be chosen according to 'map_select_fun' or for those values that go beyond 'display_range'. Takes the value 'white' by default.} @@ -106,6 +136,10 @@ following order: bottom, left, top, and right. If not specified, use the default of par("mar"), c(5.1, 4.1, 4.1, 2.1). Used as 'margin_scale' in s2dv::PlotEquiMap.} +\item{bar_extra_margin}{Parameter from s2dv::ColorBar. Extra margins to be +added around the colour bar, in the format c(y1, x1, y2, x2). The units are +margin lines. Takes rep(0, 4) by default.} + \item{fileout}{File where to save the plot. If not specified (default) a graphics device will pop up. Extensions allowed: eps/ps, jpeg, png, pdf, bmp and tiff} diff --git a/man/PlotPDFsOLE.Rd b/man/PlotPDFsOLE.Rd index e2c6606eb20822b0b29d40c99411dbb0de451710..748310349c001ac09f54a0f374fc79eb24a22f17 100644 --- a/man/PlotPDFsOLE.Rd +++ b/man/PlotPDFsOLE.Rd @@ -70,5 +70,5 @@ dim(pdf_2) <- c(statistic = 2) PlotPDFsOLE(pdf_1, pdf_2) } \author{ -Eroteida Sanchez-Garcia - AEMET, //email{esanchezg@aemet.es} +Eroteida Sanchez-Garcia - AEMET, \email{esanchezg@aemet.es} } diff --git a/man/Predictability.Rd b/man/Predictability.Rd index 04f7204eea53f35f0dad6e1ffcb75a0b86232ffe..792af61ad8e30be0c2a06e3c79e0209d6230ca10 100644 --- a/man/Predictability.Rd +++ b/man/Predictability.Rd @@ -20,20 +20,21 @@ ProxiesAttractor.} \value{ A list of length 2: \itemize{ -\item\code{pred.dim} {a list of two lists 'qdim' and 'pos.d'. The 'qdim' list -contains values of local dimension 'dim' divided by terciles: -d1: lower tercile (high predictability), -d2: middle tercile, -d3: higher tercile (low predictability) -The 'pos.d' list contains the position of each tercile in parameter 'dim'} - -\item\code{pred.theta} {a list of two lists 'qtheta' and 'pos.t'. -The 'qtheta' list contains values of the inverse of persistence 'theta' -divided by terciles: -th1: lower tercile (high predictability), -th2: middle tercile, -th3: higher tercile (low predictability) -The 'pos.t' list contains the position of each tercile in parameter 'theta'} + \item{'pred.dim', a list of two lists 'qdim' and 'pos.d'. The 'qdim' list + contains values of local dimension 'dim' divided by terciles: + d1: lower tercile (high predictability), + d2: middle tercile, + d3: higher tercile (low predictability) + The 'pos.d' list contains the position of each tercile in parameter + 'dim'.} +\item{'pred.theta', a list of two lists 'qtheta' and 'pos.t'. + The 'qtheta' list contains values of the inverse of persistence 'theta' + divided by terciles: + th1: lower tercile (high predictability), + th2: middle tercile, + th3: higher tercile (low predictability) + The 'pos.t' list contains the position of each tercile in parameter + 'theta'.} } dyn_scores values from 0 to 1. A dyn_score of 1 indicates the highest diff --git a/man/RFTemp.Rd b/man/RFTemp.Rd index 957ccc918d42b5bbdc160b21d7b2cd3f86ad8b8f..e55e14c0de639fbb7815c4a93e039052e1c9d2ba 100644 --- a/man/RFTemp.Rd +++ b/man/RFTemp.Rd @@ -104,7 +104,7 @@ res <- RFTemp(t, lon, lat, o, lono, lato, xlim = c(4, 8), ylim = c(43, 46), \references{ Method described in ERA4CS MEDSCOPE milestone M3.2: High-quality climate prediction data available to WP4 here: -\ url{https://www.medscope-project.eu/the-project/deliverables-reports/} +\url{https://www.medscope-project.eu/the-project/deliverables-reports/} and in H2020 ECOPOTENTIAL Deliverable No. 8.1: High resolution (1-10 km) climate, land use and ocean change scenarios here: \url{https://ec.europa.eu/research/participants/documents/downloadPublic?documentIds=080166e5b6cd2324&appId=PPGMS}. diff --git a/vignettes/Analogs_vignette.Rmd b/vignettes/Analogs_vignette.Rmd index 4a8953f6819f0d76cedc3f696dd12f2d8b87f2a3..de4594e8c8db0952452e1c5599bffb1bb928b568 100644 --- a/vignettes/Analogs_vignette.Rmd +++ b/vignettes/Analogs_vignette.Rmd @@ -123,7 +123,7 @@ As expected, they are exatly the same. ### Exemple 2: Load data using CST_Start -In this case, the spatial field of a single forecast day will be downscale using Analogs in this example. This will allow illustrating how to use `CST_Start` to retrieve observations separated from simulations. To explore other options, see other CSTools vignettes as well as `CST_Start` documentation and [startR](https://cran.r-project.org/web/packages/startR/index.html) package. +In this case, the spatial field of a single forecast day will be downscale using Analogs in this example. This will allow illustrating how to use `CST_Start` to retrieve observations separated from simulations. To explore other options, see other CSTools vignettes as well as `CST_Start` documentation and [startR](https://CRAN.R-project.org/package=startR) package. The simulations available for the desired model cover the period 1993-2016. Here, the 15th of October 2000 (for the simulation initialized in the 1st of October 2000), will be downscaled. For ERA5 from 1979 to the present days. For this example we will just use October days from 2000 to 2006, so, the starting dates can be defined by running the following lines: diff --git a/vignettes/Data_Considerations.Rmd b/vignettes/Data_Considerations.Rmd index e6e207241a73b4a139969df8cb7db0a0ea85af26..a07f6aeb52126ba89b986e77ed31721d933f0530 100644 --- a/vignettes/Data_Considerations.Rmd +++ b/vignettes/Data_Considerations.Rmd @@ -78,7 +78,7 @@ CSTools main objective is to share state-of-the-arts post-processing methods wit - CST_Load can perform spatial averages over a defined region or return the lat-lon grid and - CST_Load can read from files using multiple parallel processes among other possibilites. -CSTools also has the function `CST_Start` from [startR](https://cran.r-project.org/web/packages/startR/index.html) that is more flexible than `CST_Load`. We recommend to use `CST_Start` since it's more efficient and flexible. +CSTools also has the function `CST_Start` from [startR](https://CRAN.R-project.org/package=startR) that is more flexible than `CST_Load`. We recommend to use `CST_Start` since it's more efficient and flexible. If you plan to use `CST_Load` or `CST_Start`, we have developed guidelines to download and formatting the data. See [CDS_Seasonal_Downloader](https://earth.bsc.es/gitlab/es/cds-seasonal-downloader). diff --git a/vignettes/Figures/Analogs1.png b/vignettes/Figures/Analogs1.png index fa60c4e61ae52e46c6c3850bb68baa13376d99f6..98011c3b16639c624a1e5a905061cee14cb2c7b5 100644 Binary files a/vignettes/Figures/Analogs1.png and b/vignettes/Figures/Analogs1.png differ diff --git a/vignettes/Figures/Analogs2.png b/vignettes/Figures/Analogs2.png index 3b37a4c020ab6dc1e785701502e83148dcddd621..4878191a858e143835e7c5016e865db86ca053c7 100644 Binary files a/vignettes/Figures/Analogs2.png and b/vignettes/Figures/Analogs2.png differ diff --git a/vignettes/Figures/Analogs3.png b/vignettes/Figures/Analogs3.png index 08097fdea8f0598b36d9b6db381cbda7994b8917..7755b62056360c5541eb5dfbb59fa66d95a7120f 100644 Binary files a/vignettes/Figures/Analogs3.png and b/vignettes/Figures/Analogs3.png differ diff --git a/vignettes/Figures/Analogs4.png b/vignettes/Figures/Analogs4.png index 2e7c9c64c332e7521a0f140a5ed423e6bd4e5864..f5b8c1c77be9c063156bdb7bb3793f70e155fbdf 100644 Binary files a/vignettes/Figures/Analogs4.png and b/vignettes/Figures/Analogs4.png differ diff --git a/vignettes/Figures/Analogs5.png b/vignettes/Figures/Analogs5.png index c6343cae34495baed514525f15c068d5aa433815..ba4e8ac0eca7cf45534eb0cfc0fd73c2682e99b2 100644 Binary files a/vignettes/Figures/Analogs5.png and b/vignettes/Figures/Analogs5.png differ diff --git a/vignettes/Figures/Analogs6.png b/vignettes/Figures/Analogs6.png index e509245b8e1c3fb454dc8e541ea96b7f058cb27d..9283d88e4633dff2eaa2c691b15eca17924172ec 100644 Binary files a/vignettes/Figures/Analogs6.png and b/vignettes/Figures/Analogs6.png differ diff --git a/vignettes/Figures/EnsClus_4clus_both_mem_std_Fig1.png b/vignettes/Figures/EnsClus_4clus_both_mem_std_Fig1.png index 9e3a64ba6484eefcd6d82beceff60f314b37b353..b87a3b6428938c63089c0e1c4e3b9b9ef23ca8d4 100644 Binary files a/vignettes/Figures/EnsClus_4clus_both_mem_std_Fig1.png and b/vignettes/Figures/EnsClus_4clus_both_mem_std_Fig1.png differ diff --git a/vignettes/Figures/EnsClus_4clus_both_mem_std_Fig2.png b/vignettes/Figures/EnsClus_4clus_both_mem_std_Fig2.png index fecc8d94feb81cf0e6baa877200e9e3a98851669..64f99b17490c2fd965b21ec367ba71ba0861b3aa 100644 Binary files a/vignettes/Figures/EnsClus_4clus_both_mem_std_Fig2.png and b/vignettes/Figures/EnsClus_4clus_both_mem_std_Fig2.png differ diff --git a/vignettes/Figures/Meteofrance_r360x180.png b/vignettes/Figures/Meteofrance_r360x180.png index 0cfc53e224e8737fc9c1afd3ceec8f29b9344bf0..06d63a3d8c6c8368fb96ed944045b2efa4339147 100644 Binary files a/vignettes/Figures/Meteofrance_r360x180.png and b/vignettes/Figures/Meteofrance_r360x180.png differ diff --git a/vignettes/Figures/MostLikelyTercile_fig1.png b/vignettes/Figures/MostLikelyTercile_fig1.png index 5f5b4322607ec7d6a098cc1f9ca40e5a5dce9f57..0150a7f2cf1fa75388598d3e83031450252309c0 100644 Binary files a/vignettes/Figures/MostLikelyTercile_fig1.png and b/vignettes/Figures/MostLikelyTercile_fig1.png differ diff --git a/vignettes/Figures/MostLikelyTercile_fig2.png b/vignettes/Figures/MostLikelyTercile_fig2.png index 62f6a5f05a559fb83b4dce1e101789c2c35a15cb..5ba969e4dba881f34a5364707327524a84d56989 100644 Binary files a/vignettes/Figures/MostLikelyTercile_fig2.png and b/vignettes/Figures/MostLikelyTercile_fig2.png differ diff --git a/vignettes/Figures/MostLikelyTercile_fig3.png b/vignettes/Figures/MostLikelyTercile_fig3.png index 72bb26efdc85f9fa87e98f8e0ffc244acf4f922c..edf922e1a3071e653c35f862e7fbfa0173ce8dc8 100644 Binary files a/vignettes/Figures/MostLikelyTercile_fig3.png and b/vignettes/Figures/MostLikelyTercile_fig3.png differ diff --git a/vignettes/Figures/MultiModelSkill_cor_tas_1993-2012.png b/vignettes/Figures/MultiModelSkill_cor_tas_1993-2012.png index 962eedb6b65c280cc4dc7f49aca53ecdf254d39f..cad7506c9a9a442180cc891fd8dcae6001db32a7 100644 Binary files a/vignettes/Figures/MultiModelSkill_cor_tas_1993-2012.png and b/vignettes/Figures/MultiModelSkill_cor_tas_1993-2012.png differ diff --git a/vignettes/Figures/MultiModelSkill_rms_tas_1993-2012.png b/vignettes/Figures/MultiModelSkill_rms_tas_1993-2012.png index c0ec379c01cc9cbe767a4cf46558e526723d25ee..764a6fc20dc86668addec44db2e556c80c538b94 100644 Binary files a/vignettes/Figures/MultiModelSkill_rms_tas_1993-2012.png and b/vignettes/Figures/MultiModelSkill_rms_tas_1993-2012.png differ diff --git a/vignettes/Figures/MultiModelSkill_rmsss_tas_1993-2012.png b/vignettes/Figures/MultiModelSkill_rmsss_tas_1993-2012.png index 87f8c888489ddba9289596e14a8f3897b3b3be2b..5c4b4a1b6d0574b3e0489105435f6bcaa9f1d911 100644 Binary files a/vignettes/Figures/MultiModelSkill_rmsss_tas_1993-2012.png and b/vignettes/Figures/MultiModelSkill_rmsss_tas_1993-2012.png differ diff --git a/vignettes/Figures/MultivarRMSE_gloseas5_tas_prlr_1993-2012.png b/vignettes/Figures/MultivarRMSE_gloseas5_tas_prlr_1993-2012.png index 31f4a2723982ebd2f71f2d3a2e2e6aa9e63143b3..4c49afcac163b9ab20b096ccf498c55495276f0f 100644 Binary files a/vignettes/Figures/MultivarRMSE_gloseas5_tas_prlr_1993-2012.png and b/vignettes/Figures/MultivarRMSE_gloseas5_tas_prlr_1993-2012.png differ diff --git a/vignettes/Figures/PlotForecastPDF_ex1.png b/vignettes/Figures/PlotForecastPDF_ex1.png index 6fd220afde64fbe9c8b7a7e5847eddfcf51f08ae..0fddba29a26775647f1ee454f8f2c920a07c3dab 100644 Binary files a/vignettes/Figures/PlotForecastPDF_ex1.png and b/vignettes/Figures/PlotForecastPDF_ex1.png differ diff --git a/vignettes/Figures/PlotForecastPDF_ex2.png b/vignettes/Figures/PlotForecastPDF_ex2.png index f427fb1d090c5f1743e87659e2d1e4b6aa8e8a05..8288d3a1c9bb64669b136fcfb07820e9f3dc58ce 100644 Binary files a/vignettes/Figures/PlotForecastPDF_ex2.png and b/vignettes/Figures/PlotForecastPDF_ex2.png differ diff --git a/vignettes/Figures/PlotForecastPDF_ex3.png b/vignettes/Figures/PlotForecastPDF_ex3.png index 5fe55ad04d31e621d39c254ba7c97ea91766a9a7..3525ad0ccef39302421dbcd5e8d47b3e0a4c549e 100644 Binary files a/vignettes/Figures/PlotForecastPDF_ex3.png and b/vignettes/Figures/PlotForecastPDF_ex3.png differ diff --git a/vignettes/Figures/PlotForecastPDF_ex4.png b/vignettes/Figures/PlotForecastPDF_ex4.png index 327375794de21bb3badd7af6233fde6bf37a6072..95d6d3bcc051abdc1c055a6e221953f81f648e71 100644 Binary files a/vignettes/Figures/PlotForecastPDF_ex4.png and b/vignettes/Figures/PlotForecastPDF_ex4.png differ diff --git a/vignettes/Figures/observed_regimes.png b/vignettes/Figures/observed_regimes.png index e323757d43337a036cf0c1dd60cbe843cfb4159b..4825d22803d98a8432bf01b8a920bc18d20d0879 100644 Binary files a/vignettes/Figures/observed_regimes.png and b/vignettes/Figures/observed_regimes.png differ diff --git a/vignettes/Figures/predicted_regimes.png b/vignettes/Figures/predicted_regimes.png index a2e1c3e062614fff59f5ce5043f4dd8e2feb445d..a9caba8343b177a38615976187ab994324deb175 100644 Binary files a/vignettes/Figures/predicted_regimes.png and b/vignettes/Figures/predicted_regimes.png differ diff --git a/vignettes/WeatherRegimes_vignette.Rmd b/vignettes/WeatherRegimes_vignette.Rmd index 68a996e54034b76ec6521b693738e601b91ab579..6e3655db59ea2d3e77fa04b9462733265dd15b07 100644 --- a/vignettes/WeatherRegimes_vignette.Rmd +++ b/vignettes/WeatherRegimes_vignette.Rmd @@ -185,4 +185,4 @@ PlotLayout(PlotEquiMap, c(1, 2), lon = exp$coords$lon, lat = exp$coords$lat, ``` -Observed and predicted weather regimes are very similar although their frequencies are slightly different. Cluster 4 is the Atlantic Ridge and cluster 1 the Blocking pattern, while cluster 2 and 3 are the positive and negative phases of the NAO. This patterns can change depending on the period analyzed. +Observed and predicted weather regimes are very similar although their frequencies are slightly different. Cluster 4 is the Atlantic Ridge and cluster 2 the Blocking pattern, while cluster 3 and 1 are the positive and negative phases of the NAO. This patterns can change depending on the period analyzed.