Skip to content

Commit

Permalink
Merge pull request #292 from JGCRI/Rv2.2.0
Browse files Browse the repository at this point in the history
Sync R package version with Hector version and update R package metadata.
  • Loading branch information
rplzzz authored Mar 25, 2019
2 parents c8aca07 + 77b739a commit 6a8f89b
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 6 deletions.
14 changes: 10 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
Package: hector
Title: Run the Hector Simple Climate Model
Version: 0.4.0
Authors@R: person("Robert", "Link", email = "robert.link@pnnl.gov", role = c("aut", "cre"))
Description: Provides R bindings for the Hector Simple Climate Model.
Title: The Hector Simple Climate Model
Version: 2.2.0
Authors@R: c(person("Robert", "Link", email = "robert.link@pnnl.gov", role = c("aut", "cre")),
person("Corinne", "Hartin", email = "corinne.hartin@pnnl.gov", role = "aut"),
person("Ben", "Bond-Lamberty", email = "BondLamberty@pnnl.gov", role = "aut"),
person("Pralit", "Patel", email = "pralit.patel@pnnl.gov", role = "aut"))
Description: Provides an R interface for the Hector Simple Climate
Model. Using this interface you can set up and initialize the model,
change model parameters and emissions inputs, run Hector, and
retrieve hector outputs.
Depends: R (>= 3.3)
License: GPL-3
Encoding: UTF-8
Expand Down
17 changes: 17 additions & 0 deletions inst/CITATION
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
bibentry('Article',
header =
'When using Hector in your research, please cite the following model documentation paper:',
key = 'hartin2015simple',
title =
'A simple object-oriented and open-source model for scientific and policy analyses of the global climate system--Hector v1.0',
author =
'Corinne A Hartin and Pralit Patel and Adria Schwarber and Robert Link and Ben Bond-Lamberty',
journal = 'Geoscientific Model Development',
volume = 8,
number = 4,
pages = '939--955',
year = 2015,
publisher = 'Copernicus GmbH',
footer =
'Hector development was supported by the U.S. Department of Energy, Office of Science, as part of research in Multi-Sector Dynamics, Earth and Environmental System Modeling Program. The Pacific Northwest National Laboratory is operated for DOE by Battelle Memorial Institute under contract DE-AC05-76RL01830.'
)
14 changes: 12 additions & 2 deletions man/hector-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6a8f89b

Please sign in to comment.