diff --git a/DESCRIPTION b/DESCRIPTION index 10cfbdfa..c7b90892 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: HiClimR -Version: 2.1.5 +Version: 2.1.6 Title: Hierarchical Climate Regionalization Author: Hamada S. Badr [aut, cre], Benjamin F. Zaitchik [aut], Amin K. Dezfuli [aut] Description: A tool for Hierarchical Climate Regionalization applicable to any correlation-based clustering. diff --git a/R/HiClimR.R b/R/HiClimR.R index e8d6b7da..13076acf 100755 --- a/R/HiClimR.R +++ b/R/HiClimR.R @@ -1,4 +1,4 @@ -# $Id: HiClimR.R, v2.1.5 2019/12/10 12:00:00 hsbadr EPS JHU # +# $Id: HiClimR.R, v2.1.6 2020/02/22 12:00:00 hsbadr EPS JHU # #-------------------------------------------------------------------------# # This is the main function of # # HiClimR (Hierarchical Climate Regionalization) R package # @@ -19,7 +19,7 @@ #-------------------------------------------------------------------------# # Clustering Methods: # # # -# 0. REGIONAL linkage or minimum inter-regional correlation # +# 0. REGIONAL linkage or minimum inter-regional correlation # # 1. WARD's minimum variance or error sum of squares method # # 2. SINGLE linkage or nearest neighbor method # # 3. COMPLETE linkage or diameter # @@ -45,7 +45,7 @@ # GNU General Public License for more details. # # # # A copy of the GNU General Public License is available at # -# https://www.r-project.org/Licenses # +# https://www.r-project.org/Licenses # #-------------------------------------------------------------------------# # HISTORY: # #-------------------------------------------------------------------------# @@ -82,13 +82,14 @@ # 1.2.2 | 07/21/15 | Updated | Hamada S. Badr | badr@jhu.edu # # 1.2.3 | 08/05/15 | Updated | Hamada S. Badr | badr@jhu.edu # #-------------------------------------------------------------------------# -# 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | badr@jhu.edu # -# 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | badr@jhu.edu # +# 2.0.0 | 12/22/18 | NOTE | Hamada S. Badr | badr@jhu.edu # +# 2.1.0 | 01/01/19 | NetCDF | Hamada S. Badr | badr@jhu.edu # # 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.3 | 01/10/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.4 | 01/20/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.5 | 12/10/19 | inherits | Hamada S. Badr | badr@jhu.edu # +# 2.1.6 | 02/22/20 | Updated | Hamada S. Badr | badr@jhu.edu # #-------------------------------------------------------------------------# # COPYRIGHT(C) 2013-2019 Earth and Planetary Sciences (EPS), JHU. # #-------------------------------------------------------------------------# diff --git a/R/HiClimR2nc.R b/R/HiClimR2nc.R index dee45f2d..4e88c737 100755 --- a/R/HiClimR2nc.R +++ b/R/HiClimR2nc.R @@ -1,4 +1,4 @@ -# $Id: HiClimR2nc.R, v2.1.5 2019/12/10 12:00:00 hsbadr EPS JHU # +# $Id: HiClimR2nc.R, v2.1.6 2020/02/22 12:00:00 hsbadr EPS JHU # #-------------------------------------------------------------------------# # This function is a part of HiClimR R package. # #-------------------------------------------------------------------------# @@ -37,13 +37,14 @@ # 1.2.2 | 07/21/15 | Updated | Hamada S. Badr | badr@jhu.edu # # 1.2.3 | 08/05/15 | Updated | Hamada S. Badr | badr@jhu.edu # #-------------------------------------------------------------------------# -# 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | badr@jhu.edu # -# 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | badr@jhu.edu # +# 2.0.0 | 12/22/18 | NOTE | Hamada S. Badr | badr@jhu.edu # +# 2.1.0 | 01/01/19 | NetCDF | Hamada S. Badr | badr@jhu.edu # # 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.3 | 01/10/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.4 | 01/20/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.5 | 12/10/19 | inherits | Hamada S. Badr | badr@jhu.edu # +# 2.1.6 | 02/22/20 | Updated | Hamada S. Badr | badr@jhu.edu # #-------------------------------------------------------------------------# # COPYRIGHT(C) 2013-2019 Earth and Planetary Sciences (EPS), JHU. # #-------------------------------------------------------------------------# diff --git a/R/coarseR.R b/R/coarseR.R index 0717b3c6..9e4be452 100755 --- a/R/coarseR.R +++ b/R/coarseR.R @@ -1,4 +1,4 @@ -# $Id: coarseR.R, v2.1.5 2019/12/10 12:00:00 hsbadr EPS JHU # +# $Id: coarseR.R, v2.1.6 2020/02/22 12:00:00 hsbadr EPS JHU # #-------------------------------------------------------------------------# # This function is a part of HiClimR R package. # #-------------------------------------------------------------------------# @@ -37,13 +37,14 @@ # 1.2.2 | 07/21/15 | Updated | Hamada S. Badr | badr@jhu.edu # # 1.2.3 | 08/05/15 | Updated | Hamada S. Badr | badr@jhu.edu # #-------------------------------------------------------------------------# -# 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | badr@jhu.edu # -# 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | badr@jhu.edu # +# 2.0.0 | 12/22/18 | NOTE | Hamada S. Badr | badr@jhu.edu # +# 2.1.0 | 01/01/19 | NetCDF | Hamada S. Badr | badr@jhu.edu # # 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.3 | 01/10/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.4 | 01/20/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.5 | 12/10/19 | inherits | Hamada S. Badr | badr@jhu.edu # +# 2.1.6 | 02/22/20 | Updated | Hamada S. Badr | badr@jhu.edu # #-------------------------------------------------------------------------# # COPYRIGHT(C) 2013-2019 Earth and Planetary Sciences (EPS), JHU. # #-------------------------------------------------------------------------# diff --git a/R/fastCor.R b/R/fastCor.R index 75e0260b..272858f2 100755 --- a/R/fastCor.R +++ b/R/fastCor.R @@ -1,4 +1,4 @@ -# $Id: fastCor.R, v2.1.5 2019/12/10 12:00:00 hsbadr EPS JHU # +# $Id: fastCor.R, v2.1.6 2020/02/22 12:00:00 hsbadr EPS JHU # #-------------------------------------------------------------------------# # This function is a part of HiClimR R package. # #-------------------------------------------------------------------------# @@ -37,13 +37,14 @@ # 1.2.2 | 07/21/15 | Updated | Hamada S. Badr | badr@jhu.edu # # 1.2.3 | 08/05/15 | Updated | Hamada S. Badr | badr@jhu.edu # #-------------------------------------------------------------------------# -# 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | badr@jhu.edu # -# 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | badr@jhu.edu # +# 2.0.0 | 12/22/18 | NOTE | Hamada S. Badr | badr@jhu.edu # +# 2.1.0 | 01/01/19 | NetCDF | Hamada S. Badr | badr@jhu.edu # # 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.3 | 01/10/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.4 | 01/20/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.5 | 12/10/19 | inherits | Hamada S. Badr | badr@jhu.edu # +# 2.1.6 | 02/22/20 | Updated | Hamada S. Badr | badr@jhu.edu # #-------------------------------------------------------------------------# # COPYRIGHT(C) 2013-2019 Earth and Planetary Sciences (EPS), JHU. # #-------------------------------------------------------------------------# diff --git a/R/geogMask.R b/R/geogMask.R index b63ab0d6..d907e252 100755 --- a/R/geogMask.R +++ b/R/geogMask.R @@ -1,4 +1,4 @@ -# $Id: geogMask.R, v2.1.5 2019/12/10 12:00:00 hsbadr EPS JHU # +# $Id: geogMask.R, v2.1.6 2020/02/22 12:00:00 hsbadr EPS JHU # #-------------------------------------------------------------------------# # This function is a part of HiClimR R package. # #-------------------------------------------------------------------------# @@ -37,13 +37,14 @@ # 1.2.2 | 07/21/15 | Updated | Hamada S. Badr | badr@jhu.edu # # 1.2.3 | 08/05/15 | Updated | Hamada S. Badr | badr@jhu.edu # #-------------------------------------------------------------------------# -# 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | badr@jhu.edu # -# 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | badr@jhu.edu # +# 2.0.0 | 12/22/18 | NOTE | Hamada S. Badr | badr@jhu.edu # +# 2.1.0 | 01/01/19 | NetCDF | Hamada S. Badr | badr@jhu.edu # # 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.3 | 01/10/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.4 | 01/20/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.5 | 12/10/19 | inherits | Hamada S. Badr | badr@jhu.edu # +# 2.1.6 | 02/22/20 | Updated | Hamada S. Badr | badr@jhu.edu # #-------------------------------------------------------------------------# # COPYRIGHT(C) 2013-2019 Earth and Planetary Sciences (EPS), JHU. # #-------------------------------------------------------------------------# diff --git a/R/grid2D.R b/R/grid2D.R index f10abf36..a71d98d5 100755 --- a/R/grid2D.R +++ b/R/grid2D.R @@ -1,4 +1,4 @@ -# $Id: grid2D.R, v2.1.5 2019/12/10 12:00:00 hsbadr EPS JHU # +# $Id: grid2D.R, v2.1.6 2020/02/22 12:00:00 hsbadr EPS JHU # #-------------------------------------------------------------------------# # This function is a part of HiClimR R package. # #-------------------------------------------------------------------------# @@ -37,13 +37,14 @@ # 1.2.2 | 07/21/15 | Updated | Hamada S. Badr | badr@jhu.edu # # 1.2.3 | 08/05/15 | Updated | Hamada S. Badr | badr@jhu.edu # #-------------------------------------------------------------------------# -# 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | badr@jhu.edu # -# 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | badr@jhu.edu # +# 2.0.0 | 12/22/18 | NOTE | Hamada S. Badr | badr@jhu.edu # +# 2.1.0 | 01/01/19 | NetCDF | Hamada S. Badr | badr@jhu.edu # # 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.3 | 01/10/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.4 | 01/20/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.5 | 12/10/19 | inherits | Hamada S. Badr | badr@jhu.edu # +# 2.1.6 | 02/22/20 | Updated | Hamada S. Badr | badr@jhu.edu # #-------------------------------------------------------------------------# # COPYRIGHT(C) 2013-2019 Earth and Planetary Sciences (EPS), JHU. # #-------------------------------------------------------------------------# diff --git a/R/minSigCor.R b/R/minSigCor.R index 96bee750..561a7986 100755 --- a/R/minSigCor.R +++ b/R/minSigCor.R @@ -1,4 +1,4 @@ -# $Id: minSigCor.R, v2.1.5 2019/12/10 12:00:00 hsbadr EPS JHU # +# $Id: minSigCor.R, v2.1.6 2020/02/22 12:00:00 hsbadr EPS JHU # #-------------------------------------------------------------------------# # This function is a part of HiClimR R package. # #-------------------------------------------------------------------------# @@ -37,13 +37,14 @@ # 1.2.2 | 07/21/15 | Updated | Hamada S. Badr | badr@jhu.edu # # 1.2.3 | 08/05/15 | Updated | Hamada S. Badr | badr@jhu.edu # #-------------------------------------------------------------------------# -# 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | badr@jhu.edu # -# 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | badr@jhu.edu # +# 2.0.0 | 12/22/18 | NOTE | Hamada S. Badr | badr@jhu.edu # +# 2.1.0 | 01/01/19 | NetCDF | Hamada S. Badr | badr@jhu.edu # # 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.3 | 01/10/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.4 | 01/20/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.5 | 12/10/19 | inherits | Hamada S. Badr | badr@jhu.edu # +# 2.1.6 | 02/22/20 | Updated | Hamada S. Badr | badr@jhu.edu # #-------------------------------------------------------------------------# # COPYRIGHT(C) 2013-2019 Earth and Planetary Sciences (EPS), JHU. # #-------------------------------------------------------------------------# diff --git a/R/validClimR.R b/R/validClimR.R index 2678a4a9..bfa9711e 100755 --- a/R/validClimR.R +++ b/R/validClimR.R @@ -1,4 +1,4 @@ -# $Id: validClimR.R, v2.1.5 2019/12/10 12:00:00 hsbadr EPS JHU # +# $Id: validClimR.R, v2.1.6 2020/02/22 12:00:00 hsbadr EPS JHU # #-------------------------------------------------------------------------# # This function is a part of HiClimR R package. # #-------------------------------------------------------------------------# @@ -37,13 +37,14 @@ # 1.2.2 | 07/21/15 | Updated | Hamada S. Badr | badr@jhu.edu # # 1.2.3 | 08/05/15 | Updated | Hamada S. Badr | badr@jhu.edu # #-------------------------------------------------------------------------# -# 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | badr@jhu.edu # -# 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | badr@jhu.edu # +# 2.0.0 | 12/22/18 | NOTE | Hamada S. Badr | badr@jhu.edu # +# 2.1.0 | 01/01/19 | NetCDF | Hamada S. Badr | badr@jhu.edu # # 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.3 | 01/10/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.4 | 01/20/19 | Updated | Hamada S. Badr | badr@jhu.edu # # 2.1.5 | 12/10/19 | inherits | Hamada S. Badr | badr@jhu.edu # +# 2.1.6 | 02/22/20 | Updated | Hamada S. Badr | badr@jhu.edu # #-------------------------------------------------------------------------# # COPYRIGHT(C) 2013-2019 Earth and Planetary Sciences (EPS), JHU. # #-------------------------------------------------------------------------# diff --git a/README.md b/README.md index 32e1a8d0..b9fdcd4e 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ HiClimR * [Citation](#citation) * [History](#history) * [Changes](#changes) + * [2020-02-22: version 2.1.6](#2020-02-22-version-216) * [2019-12-10: version 2.1.5](#2019-12-10-version-215) * [2019-01-20: version 2.1.4](#2019-01-20-version-214) * [2019-01-10: version 2.1.3](#2019-01-10-version-213) @@ -224,18 +225,24 @@ https://cran.r-project.org/package=HiClimR. | **1.2.1** | 05/24/15 | Updated | Hamada S. Badr | badr@jhu.edu | | **1.2.2** | 07/21/15 | Updated | Hamada S. Badr | badr@jhu.edu | | **1.2.3** | 08/05/15 | Updated | Hamada S. Badr | badr@jhu.edu | -| **2.0.0** | 12/22/18 | **Updated** | Hamada S. Badr | badr@jhu.edu | -| **2.1.0** | 01/01/19 | **Updated** | Hamada S. Badr | badr@jhu.edu | -| **2.1.1** | 01/02/19 | **Updated** | Hamada S. Badr | badr@jhu.edu | -| **2.1.2** | 01/04/19 | **Updated** | Hamada S. Badr | badr@jhu.edu | -| **2.1.3** | 01/10/19 | **Updated** | Hamada S. Badr | badr@jhu.edu | -| **2.1.4** | 01/20/19 | **Updated** | Hamada S. Badr | badr@jhu.edu | +| **2.0.0** | 12/22/18 | **NOTE** | Hamada S. Badr | badr@jhu.edu | +| **2.1.0** | 01/01/19 | **NetCDF** | Hamada S. Badr | badr@jhu.edu | +| **2.1.1** | 01/02/19 | Updated | Hamada S. Badr | badr@jhu.edu | +| **2.1.2** | 01/04/19 | Updated | Hamada S. Badr | badr@jhu.edu | +| **2.1.3** | 01/10/19 | Updated | Hamada S. Badr | badr@jhu.edu | +| **2.1.4** | 01/20/19 | Updated | Hamada S. Badr | badr@jhu.edu | | **2.1.5** | 12/10/19 | **inherits** | Hamada S. Badr | badr@jhu.edu | +| **2.1.6** | 02/22/20 | Updated | Hamada S. Badr | badr@jhu.edu | [⇪](#hiclimr) ## Changes +#### 2020-02-22: version 2.1.6 + +* README: Added CRAN downloads badge +* R: Fix non-informative failure for unsupported input of a vector + #### 2019-12-10: version 2.1.5 * R: Use `inherits()` to check class inheritance diff --git a/src/HiClimR.f90 b/src/HiClimR.f90 index eaec3cff..c5bf4253 100755 --- a/src/HiClimR.f90 +++ b/src/HiClimR.f90 @@ -112,13 +112,14 @@ ! 1.2.2 | 07/21/15 | Updated | Hamada S. Badr | badr@jhu.edu ! ! 1.2.3 | 08/05/15 | Updated | Hamada S. Badr | badr@jhu.edu ! !-------------------------------------------------------------------------! -! 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | badr@jhu.edu ! -! 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | badr@jhu.edu ! +! 2.0.0 | 12/22/18 | NOTE | Hamada S. Badr | badr@jhu.edu ! +! 2.1.0 | 01/01/19 | NetCDF | Hamada S. Badr | badr@jhu.edu ! ! 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | badr@jhu.edu ! ! 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | badr@jhu.edu ! ! 2.1.3 | 01/10/19 | Updated | Hamada S. Badr | badr@jhu.edu ! ! 2.1.4 | 01/20/19 | Updated | Hamada S. Badr | badr@jhu.edu ! ! 2.1.5 | 12/10/19 | inherits | Hamada S. Badr | badr@jhu.edu ! +! 2.1.5 | 02/22/20 | Updated | Hamada S. Badr | badr@jhu.edu ! ! ! !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++! ! !