Skip to content

Commit

Permalink
version 2.1.2
Browse files Browse the repository at this point in the history
- Fixed NOTE: Registering native routines
- Fixed example ERROR in CRAN checks
- Supported contiguity constraint based on geographic distance
- Exporting region map and mean timeseries into NetCDF-4 file
- Added example to export NetCDF-4 file
- fastCor: Fixed row/col names of the correlation matrix
- fastCor: Removed zero-variance data
- fastCor: Introduced optBLAS
- fastCor: Code cleanup
- Reformatted R source code
- Replaced "multi-variate" with "multivariate"
- Renamed "weightedVar" to "weightMVC"
- Updated dependencies and suggested packages
- Updated package DESCRIPTION
- Updated and fixed the examples
- Updated CRU TS dataset citation
- Updated citation information
- Updated README and all URLs
  • Loading branch information
hsbadr committed Jan 4, 2019
1 parent f6b1dc6 commit 60cce1c
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 10 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: HiClimR
Version: 2.1.1
Version: 2.1.2
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
3 changes: 2 additions & 1 deletion R/HiClimR.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $Id: HiClimR.R, v2.1.1 2019/01/02 12:00:00 hsbadr EPS JHU #
# $Id: HiClimR.R, v2.1.2 2019/01/04 12:00:00 hsbadr EPS JHU #
#-------------------------------------------------------------------------#
# This is the main function of #
# HiClimR (Hierarchical Climate Regionalization) R package #
Expand Down Expand Up @@ -85,6 +85,7 @@
# 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | [email protected] #
# 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | [email protected] #
# 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | [email protected] #
# 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | [email protected] #
#-------------------------------------------------------------------------#
# COPYRIGHT(C) 2013-2019 Earth and Planetary Sciences (EPS), JHU. #
#-------------------------------------------------------------------------#
Expand Down
3 changes: 2 additions & 1 deletion R/HiClimR2nc.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $Id: HiClimR2nc.R, v2.1.1 2019/01/02 12:00:00 hsbadr EPS JHU #
# $Id: HiClimR2nc.R, v2.1.2 2019/01/04 12:00:00 hsbadr EPS JHU #
#-------------------------------------------------------------------------#
# This function is a part of HiClimR R package. #
#-------------------------------------------------------------------------#
Expand Down Expand Up @@ -40,6 +40,7 @@
# 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | [email protected] #
# 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | [email protected] #
# 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | [email protected] #
# 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | [email protected] #
#-------------------------------------------------------------------------#
# COPYRIGHT(C) 2013-2019 Earth and Planetary Sciences (EPS), JHU. #
#-------------------------------------------------------------------------#
Expand Down
3 changes: 2 additions & 1 deletion R/coarseR.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $Id: coarseR.R, v2.1.1 2019/01/02 12:00:00 hsbadr EPS JHU #
# $Id: coarseR.R, v2.1.2 2019/01/04 12:00:00 hsbadr EPS JHU #
#-------------------------------------------------------------------------#
# This function is a part of HiClimR R package. #
#-------------------------------------------------------------------------#
Expand Down Expand Up @@ -40,6 +40,7 @@
# 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | [email protected] #
# 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | [email protected] #
# 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | [email protected] #
# 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | [email protected] #
#-------------------------------------------------------------------------#
# COPYRIGHT(C) 2013-2019 Earth and Planetary Sciences (EPS), JHU. #
#-------------------------------------------------------------------------#
Expand Down
3 changes: 2 additions & 1 deletion R/fastCor.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $Id: fastCor.R, v2.1.1 2019/01/02 12:00:00 hsbadr EPS JHU #
# $Id: fastCor.R, v2.1.2 2019/01/04 12:00:00 hsbadr EPS JHU #
#-------------------------------------------------------------------------#
# This function is a part of HiClimR R package. #
#-------------------------------------------------------------------------#
Expand Down Expand Up @@ -40,6 +40,7 @@
# 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | [email protected] #
# 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | [email protected] #
# 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | [email protected] #
# 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | [email protected] #
#-------------------------------------------------------------------------#
# COPYRIGHT(C) 2013-2019 Earth and Planetary Sciences (EPS), JHU. #
#-------------------------------------------------------------------------#
Expand Down
3 changes: 2 additions & 1 deletion R/geogMask.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $Id: geogMask.R, v2.1.1 2019/01/02 12:00:00 hsbadr EPS JHU #
# $Id: geogMask.R, v2.1.2 2019/01/04 12:00:00 hsbadr EPS JHU #
#-------------------------------------------------------------------------#
# This function is a part of HiClimR R package. #
#-------------------------------------------------------------------------#
Expand Down Expand Up @@ -40,6 +40,7 @@
# 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | [email protected] #
# 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | [email protected] #
# 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | [email protected] #
# 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | [email protected] #
#-------------------------------------------------------------------------#
# COPYRIGHT(C) 2013-2019 Earth and Planetary Sciences (EPS), JHU. #
#-------------------------------------------------------------------------#
Expand Down
3 changes: 2 additions & 1 deletion R/grid2D.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $Id: grid2D.R, v2.1.1 2019/01/02 12:00:00 hsbadr EPS JHU #
# $Id: grid2D.R, v2.1.2 2019/01/04 12:00:00 hsbadr EPS JHU #
#-------------------------------------------------------------------------#
# This function is a part of HiClimR R package. #
#-------------------------------------------------------------------------#
Expand Down Expand Up @@ -40,6 +40,7 @@
# 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | [email protected] #
# 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | [email protected] #
# 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | [email protected] #
# 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | [email protected] #
#-------------------------------------------------------------------------#
# COPYRIGHT(C) 2013-2019 Earth and Planetary Sciences (EPS), JHU. #
#-------------------------------------------------------------------------#
Expand Down
3 changes: 2 additions & 1 deletion R/minSigCor.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $Id: minSigCor.R, v2.1.1 2019/01/02 12:00:00 hsbadr EPS JHU #
# $Id: minSigCor.R, v2.1.2 2019/01/04 12:00:00 hsbadr EPS JHU #
#-------------------------------------------------------------------------#
# This function is a part of HiClimR R package. #
#-------------------------------------------------------------------------#
Expand Down Expand Up @@ -40,6 +40,7 @@
# 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | [email protected] #
# 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | [email protected] #
# 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | [email protected] #
# 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | [email protected] #
#-------------------------------------------------------------------------#
# COPYRIGHT(C) 2013-2019 Earth and Planetary Sciences (EPS), JHU. #
#-------------------------------------------------------------------------#
Expand Down
3 changes: 2 additions & 1 deletion R/validClimR.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $Id: validClimR.R, v2.1.1 2019/01/02 12:00:00 hsbadr EPS JHU #
# $Id: validClimR.R, v2.1.2 2019/01/04 12:00:00 hsbadr EPS JHU #
#-------------------------------------------------------------------------#
# This function is a part of HiClimR R package. #
#-------------------------------------------------------------------------#
Expand Down Expand Up @@ -40,6 +40,7 @@
# 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | [email protected] #
# 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | [email protected] #
# 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | [email protected] #
# 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | [email protected] #
#-------------------------------------------------------------------------#
# COPYRIGHT(C) 2013-2019 Earth and Planetary Sciences (EPS), JHU. #
#-------------------------------------------------------------------------#
Expand Down
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ HiClimR
* [Citation](#citation)
* [History](#history)
* [Changes](#changes)
* [2019-01-04: version 2.1.2](#2019-01-04-version-212)
* [2019-01-02: version 2.1.1](#2019-01-02-version-211)
* [2019-01-01: version 2.1.0](#2019-01-01-version-210)
* [2018-12-22: version 2.0.0](#2018-12-22-version-200)
Expand Down Expand Up @@ -223,11 +224,18 @@ https://cran.r-project.org/package=HiClimR.
| **2.0.0** | 12/22/18 | **Updated** | Hamada S. Badr | [email protected] |
| **2.1.0** | 01/01/19 | **Updated** | Hamada S. Badr | [email protected] |
| **2.1.1** | 01/02/19 | **Updated** | Hamada S. Badr | [email protected] |
| **2.1.2** | 01/04/19 | **Updated** | Hamada S. Badr | [email protected] |

[](#hiclimr)

## Changes

#### 2019-01-04: version 2.1.2

* Fixed example ERROR in CRAN checks
* Added example to export NetCDF-4 file
* Updated dependencies and suggested packages

#### 2019-01-02: version 2.1.1

* `fastCor`: Fixed row/col names of the correlation matrix
Expand All @@ -236,7 +244,7 @@ https://cran.r-project.org/package=HiClimR.

#### 2019-01-01: version 2.1.0

* Added contiguity constraint based on geographic distance
* Supported contiguity constraint based on geographic distance
* Exporting region map and mean timeseries into NetCDF-4 file
* Replaced `multi-variate` with `multivariate`
* Renamed `weightedVar` to `weightMVC`
Expand Down
1 change: 1 addition & 0 deletions src/HiClimR.f90
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
! 2.0.0 | 12/22/18 | Updated | Hamada S. Badr | [email protected] !
! 2.1.0 | 01/01/19 | Updated | Hamada S. Badr | [email protected] !
! 2.1.1 | 01/02/19 | Updated | Hamada S. Badr | [email protected] !
! 2.1.2 | 01/04/19 | Updated | Hamada S. Badr | [email protected] !
! !
!+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++!
! !
Expand Down

0 comments on commit 60cce1c

Please sign in to comment.