wip

Author: rcaneill

gsw_xarray/_attributes.py

@@ -457,9 +457,6 @@
             "units": "1",
         },
     ),
-    "indexer": {
-        "units": "",
-    },
     "internal_energy": {
         "units": "J/kg",
     },
@@ -487,24 +484,29 @@
     "latentheat_melting": {
         "units": "J/kg",
     },
-    "match_args_return": {
-        "units": "",
-    },
     "melting_ice_SA_CT_ratio": {
-        "units": "",
+        "units": "g/(kg K)",
     },
     "melting_ice_SA_CT_ratio_poly": {
-        "units": "",
+        "units": "g/(kg K)",
     },
     "melting_ice_equilibrium_SA_CT_ratio": {
         "units": "g/(kg K)",
     },
     "melting_ice_equilibrium_SA_CT_ratio_poly": {
         "units": "g/(kg K)",
     },
-    "melting_ice_into_seawater": {
-        "units": "g/kg",
-    },
+    "melting_ice_into_seawater": (
+        {
+            "units": "g/kg",
+        },
+        {
+            "units": "degC",
+        },
+        {
+            "units": "1",
+        },
+    ),
     "melting_seaice_SA_CT_ratio": {
         "units": "g/(kg K)",
     },
@@ -517,9 +519,14 @@
     "melting_seaice_equilibrium_SA_CT_ratio_poly": {
         "units": "g/(kg K)",
     },
-    "melting_seaice_into_seawater": {
-        "units": "degC",
-    },
+    "melting_seaice_into_seawater": (
+        {
+            "units": "g/kg",
+        },
+        {
+            "units": "degC",
+        },
+    ),
     "p_from_z": {
         "standard_name": "sea_water_pressure",
         "units": "dbar",

gsw_xarray/_names.py

@@ -87,27 +87,25 @@
     "gibbs_ice_pt0_pt0": "gibbs_ice_pt0_pt0",
     "grav": "grav",
     "ice_fraction_to_freeze_seawater": ("SA_freeze", "CT_freeze", "w_Ih"),
-    "indexer": "",
-    "internal_energy": "internal",
-    "internal_energy_ice": "internal",
+    "internal_energy": "internal_energy",
+    "internal_energy_ice": "internal_energy_ice",
     "kappa": "kappa",
-    "kappa_const_t_ice": "kappa",
-    "kappa_ice": "kappa",
-    "kappa_t_exact": "kappa",
-    "latentheat_evap_CT": "latentheat",
-    "latentheat_evap_t": "latentheat",
-    "latentheat_melting": "latentheat",
-    "match_args_return": "",
-    "melting_ice_SA_CT_ratio": "",
-    "melting_ice_SA_CT_ratio_poly": "",
+    "kappa_const_t_ice": "kappa_const_t_ice",
+    "kappa_ice": "kappa_ice",
+    "kappa_t_exact": "kappa_t_exact",
+    "latentheat_evap_CT": "latentheat_evap",
+    "latentheat_evap_t": "latentheat_evap",
+    "latentheat_melting": "latentheat_melting",
+    "melting_ice_SA_CT_ratio": "melting_ice_SA_CT_ratio",
+    "melting_ice_SA_CT_ratio_poly": "melting_ice_SA_CT_ratio",
     "melting_ice_equilibrium_SA_CT_ratio": "melting",
     "melting_ice_equilibrium_SA_CT_ratio_poly": "melting",
-    "melting_ice_into_seawater": "SA",
-    "melting_seaice_SA_CT_ratio": "melting",
-    "melting_seaice_SA_CT_ratio_poly": "melting",
-    "melting_seaice_equilibrium_SA_CT_ratio": "melting",
-    "melting_seaice_equilibrium_SA_CT_ratio_poly": "melting",
-    "melting_seaice_into_seawater": "CT",
+    "melting_ice_into_seawater": ("SA", "CT", "w_Ih_final"),
+    "melting_seaice_SA_CT_ratio": "melting_seaice_SA_CT_ratio",
+    "melting_seaice_SA_CT_ratio_poly": "melting_seaice_SA_CT_ratio",
+    "melting_seaice_equilibrium_SA_CT_ratio": "melting_seaice_equilibrium_SA_CT_ratio",
+    "melting_seaice_equilibrium_SA_CT_ratio_poly": "melting_seaice_equilibrium_SA_CT_ratio",
+    "melting_seaice_into_seawater": ("SA", "CT"),
     "p_from_z": "p",
     "pchip_interp": "",
     "pot_enthalpy_from_pt_ice": "pot",

gsw_xarray/tests/test_attrs.py

@@ -13,6 +13,8 @@
 
 @pytest.mark.parametrize("func_name", gsw_base)
 def test_(func_name):
+    if func_name in ['indexer', 'match_args_return']:
+        return
     f = getattr(gsw, func_name)
     n_args = len(signature(f).parameters)
     p = signature(f).parameters