From d0a445c678f2fde3a37d0f870dbc2a291611662e Mon Sep 17 00:00:00 2001 From: Lars Buntemeyer <5659125+larsbuntemeyer@users.noreply.github.com> Date: Sun, 22 Jan 2023 14:11:57 +0100 Subject: [PATCH 1/4] added degrees units --- cf_xarray/units.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cf_xarray/units.py b/cf_xarray/units.py index cc6d7f17..002a8bfa 100644 --- a/cf_xarray/units.py +++ b/cf_xarray/units.py @@ -99,6 +99,8 @@ def repl(m): units.define( "degrees_east = degree = degrees_east = degrees_E = degreesE = degree_east = degree_E = degreeE" ) +# degrees for grid_longitude / grid_latitude for grid_mappings +units.define("degrees = degree = degrees") units.define("[speed] = [length] / [time]") # ----- end block copied from xclim From e4923a0629f98cf0e8c28fcd2f434618a39514e6 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 22 Jan 2023 13:22:48 +0000 Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- cf_xarray/units.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cf_xarray/units.py b/cf_xarray/units.py index 002a8bfa..ca57d569 100644 --- a/cf_xarray/units.py +++ b/cf_xarray/units.py @@ -100,7 +100,7 @@ def repl(m): "degrees_east = degree = degrees_east = degrees_E = degreesE = degree_east = degree_E = degreeE" ) # degrees for grid_longitude / grid_latitude for grid_mappings -units.define("degrees = degree = degrees") +units.define("degrees = degree = degrees") units.define("[speed] = [length] / [time]") # ----- end block copied from xclim From 271fc7761c87f400a804b2c75840255a4dcd2567 Mon Sep 17 00:00:00 2001 From: Lars Buntemeyer Date: Sun, 22 Jan 2023 14:52:40 +0100 Subject: [PATCH 3/4] added test --- cf_xarray/tests/test_units.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cf_xarray/tests/test_units.py b/cf_xarray/tests/test_units.py index 80b8d767..8ce71823 100644 --- a/cf_xarray/tests/test_units.py +++ b/cf_xarray/tests/test_units.py @@ -30,6 +30,8 @@ def test_added_degrees_units(): assert ureg("degrees_north").to_base_units().units == ureg.radian assert ureg("degrees_east") == ureg("degrees") assert ureg("degrees_east").to_base_units().units == ureg.radian + + assert ureg("degrees").to_base_units().units == ureg.radian def test_gpm_unit(): From 0ad4fe2fa51a160aaa08319d212769ea8d97b44f Mon Sep 17 00:00:00 2001 From: Lars Buntemeyer Date: Sun, 22 Jan 2023 14:58:25 +0100 Subject: [PATCH 4/4] pre-commit --- cf_xarray/tests/test_units.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cf_xarray/tests/test_units.py b/cf_xarray/tests/test_units.py index 8ce71823..fa34b1b2 100644 --- a/cf_xarray/tests/test_units.py +++ b/cf_xarray/tests/test_units.py @@ -30,7 +30,7 @@ def test_added_degrees_units(): assert ureg("degrees_north").to_base_units().units == ureg.radian assert ureg("degrees_east") == ureg("degrees") assert ureg("degrees_east").to_base_units().units == ureg.radian - + assert ureg("degrees").to_base_units().units == ureg.radian