ETKF and Var3D DS assignment use actual var name instead of defaulting to 'x'

Author: kysolvik

dabench/dacycler/_etkf.py

@@ -210,4 +210,4 @@ def _cycle_obsop(self,
                                     R=R,
                                     rho=self.multiplicative_inflation)
 
-        return Xb_ds.assign(x=(['ensemble','i'], Xa.T))
+        return Xb_ds.assign({list(Xb_ds.data_vars)[0]:(Xb_ds.dims, Xa.T)})

dabench/dacycler/_var3d.py

@@ -103,4 +103,4 @@ def _cycle_obsop(self,
         xa, ierr = jscipy.sparse.linalg.cg(A, b1, x0=xb, tol=1e-05,
                                            maxiter=1000)
 
-        return xb_ds.assign(x=(xb_ds.dims, xa.T))
+        return xb_ds.assign({list(xb_ds.data_vars)[0]:(xb_ds.dims, xa.T)})