Merge pull request #64 from DocOtak/issue_63

Correct units
DocOtak · Mar 24, 2023 · bfd7e46 · bfd7e46
2 parents 08a1341 + bcba9ed
commit bfd7e46
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -5,4 +5,4 @@ repos:
     rev: 22.3.0
     hooks:
       - id: black
-        language_version: python3.8
+        language_version: python3
diff --git a/gsw_xarray/_attributes.py b/gsw_xarray/_attributes.py
@@ -308,7 +308,7 @@
     },
     "enthalpy_second_derivatives": (
         {
-            "units": "(J/kg)(g/kg)^-2",
+            "units": "(J/kg)/((g/kg)^2)",
         },
         {
             "units": "J/(kg K(g/kg))",
@@ -319,7 +319,7 @@
     ),
     "enthalpy_second_derivatives_CT_exact": (
         {
-            "units": "(J/kg)(g/kg)^-2",
+            "units": "(J/kg)/((g/kg)^2)",
         },
         {
             "units": "J/(kg K(g/kg))",
@@ -648,7 +648,7 @@
     ),
     "rho_first_derivatives": (
         {
-            "units": "(kg/m^3)(g/kg)^-1",
+            "units": "(kg/m^3)/(g/kg)",
         },
         {
             "units": "kg/(m^3 K)",
@@ -659,41 +659,41 @@
     ),
     "rho_first_derivatives_wrt_enthalpy": (
         {
-            "units": "(kg/m^3)(g/kg)^-1",  # matlab doc is uncorrect
+            "units": "(kg/m^3)/(g/kg)",  # matlab doc is uncorrect
         },
         {
-            "units": "(kg/m^3)(J/kg)^-1",
+            "units": "(kg/m^3)/(J/kg)",
         },
     ),
     "rho_ice": {
         "units": "kg/m^3",
     },
     "rho_second_derivatives": (
         {
-            "units": "(kg/m^3)(g/kg)^-2",
+            "units": "(kg/m^3)/((g/kg)^2)",
         },
         {
-            "units": "(kg/m^3)(g/kg)^-1 K^-1",
+            "units": "(kg/m^3)/(g/kg) K^-1",
         },
         {
             "units": "(kg/m^3) K^-2",
         },
         {
-            "units": "(kg/m^3)(g/kg)^-1 Pa^-1",
+            "units": "(kg/m^3)/(g/kg) Pa^-1",
         },
         {
             "units": "(kg/m^3) K^-1 Pa^-1",
         },
     ),
     "rho_second_derivatives_wrt_enthalpy": (
         {
-            "units": "(kg/m^3)(g/kg)^-2",  # matlab doc is uncorrect
+            "units": "(kg/m^3)/((g/kg)^2)",  # matlab doc is uncorrect
         },
         {
-            "units": "(kg/m^3)(g/kg)^-1 J^-1/kg^-1",
+            "units": "(kg/m^3)/(g/kg) J^-1/kg^-1",
         },
         {
-            "units": "(kg/m^3)(J/kg)^-2",
+            "units": "(kg/m^3)/((J/kg)^2)",
         },
     ),
     "rho_t_exact": {
@@ -758,7 +758,7 @@
     },
     "specvol_first_derivatives": (
         {
-            "units": "(m^3/kg)(g/kg)^-1",
+            "units": "(m^3/kg)/(g/kg)",
         },
         {
             "units": "m^3/(kg K)",
@@ -769,41 +769,41 @@
     ),
     "specvol_first_derivatives_wrt_enthalpy": (
         {
-            "units": "(m^3/kg)(g/kg)^-1",  # seems to be an error in the doc
+            "units": "(m^3/kg)/(g/kg)",  # seems to be an error in the doc
         },
         {
-            "units": "(m^3/kg)(J/kg)^-1",
+            "units": "(m^3/kg)/(J/kg)",
         },
     ),
     "specvol_ice": {
         "units": "m^3/kg",
     },
     "specvol_second_derivatives": (
         {
-            "units": "(m^3/kg)(g/kg)^-2",
+            "units": "(m^3/kg)/((g/kg)^2)",
         },
         {
-            "units": "(m^3/kg)(g/kg)^-1 K^-1",
+            "units": "(m^3/kg)/(g/kg) K^-1",
         },
         {
             "units": "(m^3/kg) K^-2",
         },
         {
-            "units": "(m^3/kg)(g/kg)^-1 Pa^-1",  # seems to be an error in the doc
+            "units": "(m^3/kg)/(g/kg) Pa^-1",  # seems to be an error in the doc
         },
         {
             "units": "(m^3/kg) K^-1 Pa^-1",
         },
     ),
     "specvol_second_derivatives_wrt_enthalpy": (
         {
-            "units": "(m^3/kg)(g/kg)^-2",  # error in doc?
+            "units": "(m^3/kg)/((g/kg)^2)",  # error in doc?
         },
         {
-            "units": "(m^3/kg)(g/kg)^-1 J^-1/kg^-1",
+            "units": "(m^3/kg)/(g/kg) J^-1/kg^-1",
         },
         {
-            "units": "(m^3/kg)(J/kg)^-2",
+            "units": "(m^3/kg)/((J/kg)^2)",
         },
     ),
     "specvol_t_exact": {