Skip to content

Commit

Permalink
version 2.1.6
Browse files Browse the repository at this point in the history 
* README: Added CRAN downloads badge
* R: Fix non-informative failure for unsupported input of a vector
  • Loading branch information
@hsbadr
hsbadr committed Feb 22, 2020
1 parent ef03958 commit 3cc9abe
Show file tree
Hide file tree
Showing 11 changed files with 51 additions and 35 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
11 changes: 6 additions & 5 deletions R/HiClimR.R
View file
Original file line number Diff line number Diff line change
@@ -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 #
Expand All @@ -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 #
Expand All @@ -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: #
#-------------------------------------------------------------------------#
Expand Down Expand Up @@ -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. #
#-------------------------------------------------------------------------#
Expand Down
7 changes: 4 additions & 3 deletions R/HiClimR2nc.R
View file
Original file line number Diff line number Diff line change
@@ -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. #
#-------------------------------------------------------------------------#
Expand Down Expand Up @@ -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. #
#-------------------------------------------------------------------------#
Expand Down
7 changes: 4 additions & 3 deletions R/coarseR.R
View file
Original file line number Diff line number Diff line change
@@ -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. #
#-------------------------------------------------------------------------#
Expand Down Expand Up @@ -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. #
#-------------------------------------------------------------------------#
Expand Down
7 changes: 4 additions & 3 deletions R/fastCor.R
View file
Original file line number Diff line number Diff line change
@@ -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. #
#-------------------------------------------------------------------------#
Expand Down Expand Up @@ -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. #
#-------------------------------------------------------------------------#
Expand Down
7 changes: 4 additions & 3 deletions R/geogMask.R
View file
Original file line number Diff line number Diff line change
@@ -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. #
#-------------------------------------------------------------------------#
Expand Down Expand Up @@ -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. #
#-------------------------------------------------------------------------#
Expand Down
7 changes: 4 additions & 3 deletions R/grid2D.R
View file
Original file line number Diff line number Diff line change
@@ -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. #
#-------------------------------------------------------------------------#
Expand Down Expand Up @@ -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. #
#-------------------------------------------------------------------------#
Expand Down
7 changes: 4 additions & 3 deletions R/minSigCor.R
View file
Original file line number Diff line number Diff line change
@@ -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. #
#-------------------------------------------------------------------------#
Expand Down Expand Up @@ -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. #
#-------------------------------------------------------------------------#
Expand Down
7 changes: 4 additions & 3 deletions R/validClimR.R
View file
Original file line number Diff line number Diff line change
@@ -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. #
#-------------------------------------------------------------------------#
Expand Down Expand Up @@ -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. #
#-------------------------------------------------------------------------#
Expand Down
19 changes: 13 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions src/HiClimR.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 !
! !
!+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++!
! !
Expand Down

0 comments on commit 3cc9abe

Please sign in to comment.