Skip to content

Commit 002ddfc

Browse files
authored
Merge pull request #170 from pascal-sauer/master
fix flipped lat in nc files written by write.magpie/writeNC
2 parents 49437cb + c73b2d6 commit 002ddfc

File tree

7 files changed

+15
-13
lines changed

7 files changed

+15
-13
lines changed

.buildlibrary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ValidationKey: '121782300'
1+
ValidationKey: '122048142'
22
AcceptedWarnings:
33
- 'Warning: package ''.*'' was built under R version'
44
- 'Warning: namespace ''.*'' is not available and has been replaced'

.github/workflows/check.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

1616
- uses: r-lib/actions/setup-pandoc@v2
1717

@@ -23,7 +23,6 @@ jobs:
2323
- uses: r-lib/actions/setup-r-dependencies@v2
2424
with:
2525
extra-packages: |
26-
gamstransfer=?ignore
2726
any::lucode2
2827
any::covr
2928
any::madrat
@@ -36,7 +35,7 @@ jobs:
3635
# gms, goxygen, GDPuc) will usually have an outdated binary version
3736
# available; by using extra-packages we get the newest version
3837

39-
- uses: actions/setup-python@v4
38+
- uses: actions/setup-python@v5
4039
with:
4140
python-version: 3.9
4241

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exclude: '^tests/testthat/_snaps/.*$'
44
repos:
55
- repo: https://github.com/pre-commit/pre-commit-hooks
6-
rev: v4.5.0
6+
rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c # frozen: v4.6.0
77
hooks:
88
- id: check-case-conflict
99
- id: check-json
@@ -15,7 +15,7 @@ repos:
1515
- id: mixed-line-ending
1616

1717
- repo: https://github.com/lorenzwalthert/precommit
18-
rev: v0.4.0
18+
rev: 7910e0323d7213f34275a7a562b9ef0fde8ce1b9 # frozen: v0.4.2
1919
hooks:
2020
- id: parsable-R
2121
- id: deps-in-desc

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ cff-version: 1.2.0
22
message: If you use this software, please cite it using the metadata from this file.
33
type: software
44
title: 'magclass: Data Class and Tools for Handling Spatial-Temporal Data'
5-
version: 6.15.0
6-
date-released: '2024-03-20'
5+
version: 6.15.1
6+
date-released: '2024-04-29'
77
abstract: Data class for increased interoperability working with spatial-temporal
88
data together with corresponding functions and methods (conversions, basic calculations
99
and basic data manipulation). The class distinguishes between spatial, temporal

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Type: Package
22
Package: magclass
33
Title: Data Class and Tools for Handling Spatial-Temporal Data
4-
Version: 6.15.0
5-
Date: 2024-03-20
4+
Version: 6.15.1
5+
Date: 2024-04-29
66
Authors@R: c(
77
person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = c("aut", "cre")),
88
person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = "aut"),

R/writeNC.R

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ writeNC <- function(x, filename, unit, ..., compression = 2, missval = NA,
3939
firstY <- gridDefinition[4]
4040
lastY <- gridDefinition[3]
4141
res <- gridDefinition[5]
42+
# swap y values before passing gridDefinition to magclass::extend
43+
gridDefinition[3] <- firstY
44+
gridDefinition[4] <- lastY
4245
}
4346
xCoords <- seq(firstX, lastX, res)
4447
yCoords <- seq(firstY, lastY, -res)

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Data Class and Tools for Handling Spatial-Temporal Data
22

3-
R package **magclass**, version **6.15.0**
3+
R package **magclass**, version **6.15.1**
44

55
[![CRAN status](https://www.r-pkg.org/badges/version/magclass)](https://cran.r-project.org/package=magclass) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1158580.svg)](https://doi.org/10.5281/zenodo.1158580) [![R build status](https://github.com/pik-piam/magclass/workflows/check/badge.svg)](https://github.com/pik-piam/magclass/actions) [![codecov](https://codecov.io/gh/pik-piam/magclass/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/magclass) [![r-universe](https://pik-piam.r-universe.dev/badges/magclass)](https://pik-piam.r-universe.dev/builds)
66

@@ -56,7 +56,7 @@ In case of questions / problems please contact Jan Philipp Dietrich <dietrich@pi
5656

5757
To cite package **magclass** in publications use:
5858

59-
Dietrich J, Bodirsky B, Bonsch M, Humpenoeder F, Bi S, Karstens K, Leip D, Sauer P (2024). _magclass: Data Class and Tools for Handling Spatial-Temporal Data_. doi:10.5281/zenodo.1158580 <https://doi.org/10.5281/zenodo.1158580>, R package version 6.15.0, <https://github.com/pik-piam/magclass>.
59+
Dietrich J, Bodirsky B, Bonsch M, Humpenoeder F, Bi S, Karstens K, Leip D, Sauer P (2024). _magclass: Data Class and Tools for Handling Spatial-Temporal Data_. doi:10.5281/zenodo.1158580 <https://doi.org/10.5281/zenodo.1158580>, R package version 6.15.1, <https://github.com/pik-piam/magclass>.
6060

6161
A BibTeX entry for LaTeX users is
6262

@@ -65,7 +65,7 @@ A BibTeX entry for LaTeX users is
6565
title = {magclass: Data Class and Tools for Handling Spatial-Temporal Data},
6666
author = {Jan Philipp Dietrich and Benjamin Leon Bodirsky and Markus Bonsch and Florian Humpenoeder and Stephen Bi and Kristine Karstens and Debbora Leip and Pascal Sauer},
6767
year = {2024},
68-
note = {R package version 6.15.0},
68+
note = {R package version 6.15.1},
6969
url = {https://github.com/pik-piam/magclass},
7070
doi = {10.5281/zenodo.1158580},
7171
}

0 commit comments

Comments
 (0)