Skip to content

Commit f2e0dcf

Browse files
committed
try this revision for CRAN
1 parent be408d7 commit f2e0dcf

6 files changed

Lines changed: 12 additions & 10 deletions

File tree

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: gsw
2-
Version: 1.1-0
2+
Version: 1.1-1
33
Title: Gibbs Sea Water Functions
44
Authors@R: c(
55
person(given="Dan",

NEWS.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# gsw 1.1-1
2+
3+
* Remove a journal link that fails because of an invalid certificate.
4+
* Fix a C function declaration that is invalid for some compilers.
5+
16
# gsw 1.1-0
27

38
This update is based on C code from https://github.com/TEOS-10/GSW-C (release

codemeta.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"codeRepository": "https://github.com/TEOS-10/GSW-R",
88
"issueTracker": "https://github.com/TEOS-10/GSW-R/issues",
99
"license": "https://spdx.org/licenses/GPL-2.0",
10-
"version": "1.1.0",
10+
"version": "1.1.1",
1111
"programmingLanguage": {
1212
"@type": "ComputerLanguage",
1313
"name": "R",
@@ -118,7 +118,7 @@
118118
},
119119
"SystemRequirements": null
120120
},
121-
"fileSize": "5191.643KB",
121+
"fileSize": "5222.4KB",
122122
"relatedLink": ["http://teos-10.github.io/GSW-R/", "https://CRAN.R-project.org/package=gsw"],
123123
"releaseNotes": "https://github.com/TEOS-10/GSW-R/blob/master/NEWS.md",
124124
"readme": "https://github.com/TEOS-10/GSW-R/blob/main/README.md",

cran-comments.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
# Submission of 1.1-0
1+
# Submission of 1.1-1
22

3-
This updates to an up-to-date version of the underlying C code and 'SAAR' file.
4-
Four functions now produce different results from the previous version, and in
5-
two of those cases the changes are large enough to merit close perusal by
6-
analysts.
3+
This should fix the NOTE and WARNING that were reported on a Debian test
4+
machine during the submission of 1.1-0 yesterday.
75

86
# Tests
97

src/wrappers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void set_up_gsw_data(int *gsw_nx_val,
6464
}
6565
}
6666

67-
void clear_gsw_data()
67+
void clear_gsw_data(void)
6868
{
6969
extern int gsw_nx, gsw_ny, gsw_nz;
7070
extern double *longs_ref, *lats_ref, *p_ref, *ndepth_ref, *saar_ref, *delta_sa_ref;

vignettes/gsw.bib

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
@article{wright_absolute_2011,
33
title = {Absolute {Salinity}, “{Density} {Salinity}” and the {Reference}-{Composition} {Salinity} {Scale}: present and future use in the seawater standard {TEOS}-10},
44
volume = {7},
5-
url = {http://www.ocean-sci.net/7/1/2011/os-7-1-2011.pdf},
65
journal = {Ocean Science},
76
author = {Wright, D. G. and Pawlowicz, R. and McDougall, T. J. and Feistel, R. and Marion, G. M.},
87
year = {2011},

0 commit comments

Comments
 (0)