Revert "loading ECCO v4r4 in zarr format " (#217)

* Revert "loading ECCO v4r4 in zarr format (#200)" This reverts commit 8561d37. * Update catalog_xarray.yaml changes to catalog * Update datasets_list.yaml update ECCO_v4r4 * Update open_oceandataset.py commented out the dropping of the k variable name * Update datasets_list.yaml reverting back to ECCO * Update open_oceandataset.py fixed the white space Co-authored-by: Ali Hasan Siddiqui <43628137+asiddi24@users.noreply.github.com>
hainegroup · Feb 14, 2022 · 5edc932 · 5edc932
1 parent 8561d37
commit 5edc932
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/oceanspy/open_oceandataset.py b/oceanspy/open_oceandataset.py
@@ -167,8 +167,7 @@ def from_catalog(name, catalog_url=None):
         if swap_dims is not None:
             ds = ds.swap_dims(swap_dims)
             # drop k dimension
-            ds = ds.drop_vars(["k_p1", "k_u", "k_l", "k"])
-
+            # ds = ds.drop_vars(["k_p1", "k_u", "k_l", "k"]) This needs fixing
         # Fix Z dimensions (Zmd, ...)
         default_Zs = ["Zp1", "Zu", "Zl", "Z"]
         # Make sure they're sorted with decreasing letter number

diff --git a/sciserver_catalogs/catalog_xarray.yaml b/sciserver_catalogs/catalog_xarray.yaml
@@ -732,14 +732,14 @@ sources:
         k_l: Zl
       rename:
         i: X
-        j: Y
         i_g: Xp1
+        j: Y
         j_g: Yp1
         hFacC: HFacC
         hFacW: HFacW
         hFacS: HFacS 
       grid_coords:
-        add_midp: False
+        add_midp: True
         grid_coords:
           Y:
             Y:
@@ -795,13 +795,13 @@ sources:
               Y: tuple(((8, 'Y', False), (1, 'X', False)))
             12: 
               X: tuple(((11, 'X', False), None))
-              Y: tuple(((9, 'Y', False), (0, 'X', False)))  
+              Y: tuple(((9, 'Y', False), (0, 'X', False)))
       parameters:
         rSphere: 6.371e+03
         eq_state: jmd95
         rho0: 1027
         g: 9.81
-        eps_nh: 0 
+        eps_nh: 0
         omega: 7.292123516990375e-05
         c_p: 3.986e+03
         tempFrz0: 9.01e-02
@@ -909,7 +909,8 @@ sources:
       citation: 
       projection:
       original_output: snapshot
-
+
+
 # ======================================================================
 # POP data (ocean only, CORE forcing)
   grd_CORE_POP:

diff --git a/sciserver_catalogs/datasets_list.yaml b/sciserver_catalogs/datasets_list.yaml
@@ -14,6 +14,6 @@ datasets:
     - KangerFjord
     - HYCOM
     - LLC4320
-    - ECCO_v4r4
+    - ECCO
     - CORE
     - HYBRID
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,6 @@ datasets: @@
         - KangerFjord
         - HYCOM
         - LLC4320
-        - ECCO_v4r4
+        - ECCO
         - CORE
         - HYBRID