Fix catalogs (#2)

* Ensure consistent paths and name * Fix inconsistencies in catalogs Co-authored-by: shkifmwr <[email protected]>
ESM-VFC · Apr 21, 2020 · 8c731b2 · 8c731b2
1 parent 809d710
commit 8c731b2
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 63 deletions.
diff --git a/catalogs/NEMO_GYRE_Test.yaml b/catalogs/NEMO_GYRE_Test.yaml
@@ -15,7 +15,7 @@ sources:
         - "https://zenodo.org/record/3634491/files/GYRE_5d_00010101_00011230_grid_T.nc"
     args:
       urlpath:
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_GYRE_test/GYRE_5d_00010101_00011230_grid_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_GYRE_Test/GYRE_5d_00010101_00011230_grid_T.nc"
       xarray_kwargs:
         decode_cf: False
         combine: by_coords
@@ -28,7 +28,7 @@ sources:
         - "https://zenodo.org/record/3634491/files/GYRE_5d_00010101_00011230_grid_U.nc"
     args:
       urlpath:
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_GYRE_test/GYRE_5d_00010101_00011230_grid_U.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_GYRE_Test/GYRE_5d_00010101_00011230_grid_U.nc"
       xarray_kwargs:
         decode_cf: False
         combine: by_coords
@@ -41,7 +41,7 @@ sources:
         - "https://zenodo.org/record/3634491/files/GYRE_5d_00010101_00011230_grid_V.nc"
     args:
       urlpath:
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_GYRE_test/GYRE_5d_00010101_00011230_grid_V.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_GYRE_Test/GYRE_5d_00010101_00011230_grid_V.nc"
       xarray_kwargs:
         decode_cf: False
         combine: by_coords
@@ -54,7 +54,7 @@ sources:
         - "https://zenodo.org/record/3634491/files/GYRE_5d_00010101_00011230_grid_W.nc"
     args:
       urlpath:
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_GYRE_test/GYRE_5d_00010101_00011230_grid_W.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_GYRE_Test/GYRE_5d_00010101_00011230_grid_W.nc"
       xarray_kwargs:
         decode_cf: False
         combine: by_coords
@@ -67,7 +67,7 @@ sources:
         - "https://zenodo.org/record/3634491/files/mesh_mask.nc"
     args:
       urlpath:
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_GYRE_test/mesh_mask.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_GYRE_Test/mesh_mask.nc"
       xarray_kwargs:
         decode_cf: False
         combine: by_coords
diff --git a/catalogs/NEMO_ORCA05_FOCI_Test_Full.yaml b/catalogs/NEMO_ORCA05_FOCI_Test_Full.yaml
@@ -23,15 +23,15 @@ sources:
         - "https://zenodo.org/record/3755721/files/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_grid_T.nc"
     args:
       urlpath:
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20110101_20111231_grid_T.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20120101_20121231_grid_T.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20130101_20131231_grid_T.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20140101_20141231_grid_T.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20150101_20151231_grid_T.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20160101_20161231_grid_T.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20170101_20171231_grid_T.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20180101_20181231_grid_T.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_grid_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20110101_20111231_grid_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20120101_20121231_grid_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20130101_20131231_grid_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20140101_20141231_grid_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20150101_20151231_grid_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20160101_20161231_grid_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20170101_20171231_grid_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20180101_20181231_grid_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_grid_T.nc"
       xarray_kwargs:
         decode_cf: False
         combine: by_coords
@@ -52,15 +52,15 @@ sources:
         - "https://zenodo.org/record/3755721/files/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_grid_U.nc"
     args:
       urlpath:
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20110101_20111231_grid_U.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20120101_20121231_grid_U.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20130101_20131231_grid_U.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20140101_20141231_grid_U.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20150101_20151231_grid_U.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20160101_20161231_grid_U.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20170101_20171231_grid_U.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20180101_20181231_grid_U.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_grid_U.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20110101_20111231_grid_U.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20120101_20121231_grid_U.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20130101_20131231_grid_U.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20140101_20141231_grid_U.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20150101_20151231_grid_U.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20160101_20161231_grid_U.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20170101_20171231_grid_U.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20180101_20181231_grid_U.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_grid_U.nc"
       xarray_kwargs:
         decode_cf: False
         combine: by_coords
@@ -81,15 +81,15 @@ sources:
         - "https://zenodo.org/record/3755721/files/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_grid_V.nc"
     args:
       urlpath:
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20110101_20111231_grid_V.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20120101_20121231_grid_V.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20130101_20131231_grid_V.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20140101_20141231_grid_V.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20150101_20151231_grid_V.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20160101_20161231_grid_V.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20170101_20171231_grid_V.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20180101_20181231_grid_V.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_grid_V.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20110101_20111231_grid_V.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20120101_20121231_grid_V.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20130101_20131231_grid_V.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20140101_20141231_grid_V.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20150101_20151231_grid_V.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20160101_20161231_grid_V.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20170101_20171231_grid_V.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20180101_20181231_grid_V.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_grid_V.nc"
       xarray_kwargs:
         decode_cf: False
         combine: by_coords
@@ -110,15 +110,15 @@ sources:
         - "https://zenodo.org/record/3755721/files/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_grid_W.nc"
     args:
       urlpath:
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20110101_20111231_grid_W.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20120101_20121231_grid_W.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20130101_20131231_grid_W.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20140101_20141231_grid_W.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20150101_20151231_grid_W.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20160101_20161231_grid_W.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20170101_20171231_grid_W.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20180101_20181231_grid_W.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_grid_W.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20110101_20111231_grid_W.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20120101_20121231_grid_W.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20130101_20131231_grid_W.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20140101_20141231_grid_W.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20150101_20151231_grid_W.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20160101_20161231_grid_W.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20170101_20171231_grid_W.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20180101_20181231_grid_W.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_grid_W.nc"
       xarray_kwargs:
         decode_cf: False
         combine: by_coords
@@ -139,15 +139,15 @@ sources:
         - "https://zenodo.org/record/3755721/files/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_icemod.nc"
     args:
       urlpath:
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20110101_20111231_icemod.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20120101_20121231_icemod.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20130101_20131231_icemod.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20140101_20141231_icemod.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20150101_20151231_icemod.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20160101_20161231_icemod.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20170101_20171231_icemod.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20180101_20181231_icemod.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_icemod.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20110101_20111231_icemod.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20120101_20121231_icemod.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20130101_20131231_icemod.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20140101_20141231_icemod.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20150101_20151231_icemod.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20160101_20161231_icemod.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20170101_20171231_icemod.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20180101_20181231_icemod.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_icemod.nc"
       xarray_kwargs:
         decode_cf: False
         combine: by_coords
@@ -168,15 +168,15 @@ sources:
         - "https://zenodo.org/record/3755721/files/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_ptrc_T.nc"
     args:
       urlpath:
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20110101_20111231_ptrc_T.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20120101_20121231_ptrc_T.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20130101_20131231_ptrc_T.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20140101_20141231_ptrc_T.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20150101_20151231_ptrc_T.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20160101_20161231_ptrc_T.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20170101_20171231_ptrc_T.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20180101_20181231_ptrc_T.nc"
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_ptrc_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20110101_20111231_ptrc_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20120101_20121231_ptrc_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20130101_20131231_ptrc_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20140101_20141231_ptrc_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20150101_20151231_ptrc_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20160101_20161231_ptrc_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20170101_20171231_ptrc_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20180101_20181231_ptrc_T.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/FOCI1.14-TEST.2020.04.1_1m_20190101_20191231_ptrc_T.nc"
       xarray_kwargs:
         decode_cf: False
         combine: by_coords
@@ -189,7 +189,7 @@ sources:
         - "https://zenodo.org/record/3755721/files/mesh_mask.nc"
     args:
       urlpath:
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/mesh_mask.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/mesh_mask.nc"
       xarray_kwargs:
         decode_cf: False
         combine: by_coords
@@ -202,7 +202,7 @@ sources:
         - "https://zenodo.org/record/3755721/files/new_maskglo.nc"
     args:
       urlpath:
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test/new_maskglo.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Full/new_maskglo.nc"
       xarray_kwargs:
         decode_cf: False
         combine: by_coords
diff --git a/catalogs/NEMO_ORCA05_FOCI_Test_Minimal.yaml b/catalogs/NEMO_ORCA05_FOCI_Test_Minimal.yaml
@@ -106,7 +106,7 @@ sources:
         - "https://zenodo.org/record/3755721/files/new_maskglo.nc"
     args:
       urlpath:
-        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Minimal_Minimal/new_maskglo.nc"
+        - "{{env('ESM_VFC_DATA_DIR')}}/NEMO_ORCA05_FOCI_Test_Minimal/new_maskglo.nc"
       xarray_kwargs:
         decode_cf: False
         combine: by_coords
diff --git a/catalogs/NEMO_ORCA05_Test_Full.yaml → catalogs/NEMO_ORCA05_Test.yaml b/catalogs/NEMO_ORCA05_Test_Full.yaml → catalogs/NEMO_ORCA05_Test.yaml
@@ -9,7 +9,7 @@ sources:
 
   NEMO_ORCA05_Test_grid_T:
     driver: netcdf
-    description: 'NEMO ORCA05 Test Data Files (see: https://doi.org/10.5281/zenodo.3755517)
+    description: 'NEMO ORCA05 Test Data Files (see: https://doi.org/10.5281/zenodo.3755517)'
     metadata:
       data_urls:
         - "https://zenodo.org/record/3755517/files/ORCA05.L46.LIM2vp.CORE.XIOS2-TEST.2020.04.1_5d_19900101_19901231_grid_T.nc"