Eliminate subdirectories

jahn · May 16, 2024 · 2ae1449 · 2ae1449
1 parent 2dbf229
commit 2ae1449
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/build_testing.yml b/.github/workflows/build_testing.yml
@@ -102,11 +102,11 @@ jobs:
      - name: Download mnc test data
        uses: wei/[email protected]
        with:
-         args: https://engaging-web.mit.edu/~jahn/MITgcmutils/global_ocean.cs32x15/run/mnc_test_0001/{oceDiag,state,phiHyd,phiHydLow}.0000072000.t0{01,02,03,04,05,06,07,08,09,10,11,12}.nc -o utils/python/MITgcmutils/tests/data/global_ocean.cs32x15/run/mnc_test_0001/#1.0000072000.t0#2.nc
+         args: https://engaging-web.mit.edu/~jahn/MITgcmutils/global_ocean.cs32x15/{oceDiag,state,phiHyd,phiHydLow}.0000072000.t0{01,02,03,04,05,06,07,08,09,10,11,12}.nc -o utils/python/MITgcmutils/tests/data/global_ocean.cs32x15/#1.0000072000.t0#2.nc
      - name: Download mnc grid data
        uses: wei/[email protected]
        with:
-         args: https://engaging-web.mit.edu/~jahn/MITgcmutils/global_ocean.cs32x15/run/mnc_test_0001/grid.t0{01,02,03,04,05,06,07,08,09,10,11,12}.nc -o utils/python/MITgcmutils/tests/data/global_ocean.cs32x15/run/mnc_test_0001/grid.t0#1.nc
+         args: https://engaging-web.mit.edu/~jahn/MITgcmutils/global_ocean.cs32x15/grid.t0{01,02,03,04,05,06,07,08,09,10,11,12}.nc -o utils/python/MITgcmutils/tests/data/global_ocean.cs32x15/grid.t0#1.nc
      - name: Run Tox
        run: tox -e ${{ matrix.env }}
        working-directory: utils/python/MITgcmutils

diff --git a/..._cs/tr_run.thSI/landStDiag.0000000000.txt → .../aim.5l_cs.thSI/landStDiag.0000000000.txt b/..._cs/tr_run.thSI/landStDiag.0000000000.txt → .../aim.5l_cs.thSI/landStDiag.0000000000.txt
diff --git a/...tr_run.thsice/thSIceStDiag.0000036000.txt → ...s32x15.thsice/thSIceStDiag.0000036000.txt b/...tr_run.thsice/thSIceStDiag.0000036000.txt → ...s32x15.thsice/thSIceStDiag.0000036000.txt
diff --git a/...x5/tr_run.impIGW/dynStDiag.0000025920.txt → ...s-32x32x5.impIGW/dynStDiag.0000025920.txt b/...x5/tr_run.impIGW/dynStDiag.0000025920.txt → ...s-32x32x5.impIGW/dynStDiag.0000025920.txt
diff --git a/..._ocean.cs32x15/run/mnc_test_0001/grid.cdl → ...s/tests/md5/global_ocean.cs32x15/grid.cdl b/..._ocean.cs32x15/run/mnc_test_0001/grid.cdl → ...s/tests/md5/global_ocean.cs32x15/grid.cdl
diff --git a/..._ocean.cs32x15/run/mnc_test_0001/grid.md5 → ...s/tests/md5/global_ocean.cs32x15/grid.md5 b/..._ocean.cs32x15/run/mnc_test_0001/grid.md5 → ...s/tests/md5/global_ocean.cs32x15/grid.md5
diff --git a/.../run/mnc_test_0001/oceDiag.0000072000.cdl → ...obal_ocean.cs32x15/oceDiag.0000072000.cdl b/.../run/mnc_test_0001/oceDiag.0000072000.cdl → ...obal_ocean.cs32x15/oceDiag.0000072000.cdl
diff --git a/.../run/mnc_test_0001/oceDiag.0000072000.md5 → ...obal_ocean.cs32x15/oceDiag.0000072000.md5 b/.../run/mnc_test_0001/oceDiag.0000072000.md5 → ...obal_ocean.cs32x15/oceDiag.0000072000.md5
diff --git a/...5/run/mnc_test_0001/phiHyd.0000072000.cdl → ...lobal_ocean.cs32x15/phiHyd.0000072000.cdl b/...5/run/mnc_test_0001/phiHyd.0000072000.cdl → ...lobal_ocean.cs32x15/phiHyd.0000072000.cdl
diff --git a/...5/run/mnc_test_0001/phiHyd.0000072000.md5 → ...lobal_ocean.cs32x15/phiHyd.0000072000.md5 b/...5/run/mnc_test_0001/phiHyd.0000072000.md5 → ...lobal_ocean.cs32x15/phiHyd.0000072000.md5
diff --git a/...un/mnc_test_0001/phiHydLow.0000072000.cdl → ...al_ocean.cs32x15/phiHydLow.0000072000.cdl b/...un/mnc_test_0001/phiHydLow.0000072000.cdl → ...al_ocean.cs32x15/phiHydLow.0000072000.cdl
diff --git a/...un/mnc_test_0001/phiHydLow.0000072000.md5 → ...al_ocean.cs32x15/phiHydLow.0000072000.md5 b/...un/mnc_test_0001/phiHydLow.0000072000.md5 → ...al_ocean.cs32x15/phiHydLow.0000072000.md5
diff --git a/...15/run/mnc_test_0001/state.0000072000.cdl → ...global_ocean.cs32x15/state.0000072000.cdl b/...15/run/mnc_test_0001/state.0000072000.cdl → ...global_ocean.cs32x15/state.0000072000.cdl
diff --git a/...15/run/mnc_test_0001/state.0000072000.md5 → ...global_ocean.cs32x15/state.0000072000.md5 b/...15/run/mnc_test_0001/state.0000072000.md5 → ...global_ocean.cs32x15/state.0000072000.md5
diff --git a/utils/python/MITgcmutils/tests/run-scripts b/utils/python/MITgcmutils/tests/run-scripts
@@ -9,11 +9,11 @@ fi
 
 err=0
 for f in \
-  global_ocean.cs32x15/run/mnc_test_0001/grid \
-  global_ocean.cs32x15/run/mnc_test_0001/state.0000072000 \
-  global_ocean.cs32x15/run/mnc_test_0001/oceDiag.0000072000 \
-  global_ocean.cs32x15/run/mnc_test_0001/phiHyd.0000072000 \
-  global_ocean.cs32x15/run/mnc_test_0001/phiHydLow.0000072000 \
+  global_ocean.cs32x15/grid \
+  global_ocean.cs32x15/state.0000072000 \
+  global_ocean.cs32x15/oceDiag.0000072000 \
+  global_ocean.cs32x15/phiHyd.0000072000 \
+  global_ocean.cs32x15/phiHydLow.0000072000 \
   eccov3/dic_tave.0000025920
   do
   echo "# $f"

diff --git a/utils/python/MITgcmutils/tests/test_cs.py b/utils/python/MITgcmutils/tests/test_cs.py
@@ -35,7 +35,7 @@
     def test_pcol(tmpdir):
         with tmpdir.as_cwd():
             ds = mit.rdmnc(pjoin(TEST_DATA_PATH, 
-                'global_ocean.cs32x15/run/mnc_test_0001/state.0000072000.t*.nc'),
+                'global_ocean.cs32x15/state.0000072000.t*.nc'),
                 ['XG', 'YG', 'Eta'])
             x = ds['XG']
             y = ds['YG']
@@ -55,8 +55,8 @@ def test_pcol(tmpdir):
 
     def test_pcol_sphere(tmpdir):
         with tmpdir.as_cwd():
-            ds = mit.rdmnc(pjoin(TEST_DATA_PATH, 'global_ocean.cs32x15', 'run',
-                                 'mnc_test_0001', 'state.0000072000.*.nc'),
+            ds = mit.rdmnc(pjoin(TEST_DATA_PATH, 'global_ocean.cs32x15',
+                                 'state.0000072000.*.nc'),
                            ['XG', 'YG', 'Eta'])
             x = ds['XG']
             y = ds['YG']
@@ -78,8 +78,8 @@ def test_pcol_sphere(tmpdir):
     if havebasemap:
         def test_pcol_basemap(tmpdir):
             with tmpdir.as_cwd():
-                ds = mit.rdmnc(pjoin(TEST_DATA_PATH, 'global_ocean.cs32x15', 'run',
-                                     'mnc_test_0001', 'state.0000072000.*.nc'),
+                ds = mit.rdmnc(pjoin(TEST_DATA_PATH, 'global_ocean.cs32x15',
+                                     'state.0000072000.*.nc'),
                                ['XG', 'YG', 'Eta'])
                 x = ds['XG']
                 y = ds['YG']

diff --git a/utils/python/MITgcmutils/tests/test_diagnostics.py b/utils/python/MITgcmutils/tests/test_diagnostics.py
@@ -3,7 +3,7 @@
 import MITgcmutils as mit
 
 def test_readstats_dims():
-    locals, totals, itrs = mit.readstats('tests/diagstats/hs94.cs-32x32x5/tr_run.impIGW/dynStDiag.0000025920.txt')
+    locals, totals, itrs = mit.readstats('tests/diagstats/hs94.cs-32x32x5.impIGW/dynStDiag.0000025920.txt')
     assert itrs['ETAN'] == [25920, 25923, 25926, 25929]
     assert itrs['UVEL'] == [25920, 25923, 25926, 25929]
     assert set(locals) == {'ETAN', 'UVEL', 'VVEL', 'WVEL', 'THETA', 'PHIHYD', 'DETADT2'}
@@ -17,7 +17,7 @@ def test_readstats_dims():
 
 def test_readstats_regions_dims():
     statsPerLayer, statsVertInt, itrs = mit.readstats(
-        'tests/diagstats/aim.5l_cs/tr_run.thSI/landStDiag.0000000000.txt')
+        'tests/diagstats/aim.5l_cs.thSI/landStDiag.0000000000.txt')
     assert set(statsVertInt) == {'GrdTemp', 'GrdWater', 'LdSnowH', 'GrdSurfT'}
     assert list(itrs) == ['LdSnowH', 'GrdSurfT', 'GrdTemp', 'GrdWater']
     assert itrs['LdSnowH'] == [0, 8]
@@ -35,7 +35,7 @@ def test_readstats_regions_dims():
 
 def test_readstats_fields_regions():
     statsPerLayer, statsVertInt, itrs = mit.readstats(
-        'tests/diagstats/global_ocean.cs32x15/tr_run.thsice/thSIceStDiag.0000036000.txt')
+        'tests/diagstats/global_ocean.cs32x15.thsice/thSIceStDiag.0000036000.txt')
     assert statsVertInt.dtype.names == ('SI_Fract', 'SI_Thick', 'SI_SnowH', 'SI_Tsrf', 'SI_Tice1', 'SI_Tice2', 'SI_Qice1', 'SI_Qice2', 'SIsnwPrc', 'SIalbedo', 'SIsnwAge', 'SIflx2oc', 'SIfrw2oc', 'SIsaltFx', 'SIflxAtm', 'SIfrwAtm')
     assert list(itrs) == ['SI_Fract', 'SI_Thick', 'SI_SnowH', 'SI_Tsrf', 'SI_Tice1', 'SI_Tice2', 'SI_Qice1', 'SI_Qice2', 'SIsnwPrc', 'SIalbedo', 'SIsnwAge', 'SIflx2oc', 'SIfrw2oc', 'SIsaltFx', 'SIflxAtm', 'SIfrwAtm']
     assert itrs['SI_Fract'] == [36010, 36020]

diff --git a/utils/python/MITgcmutils/tests/test_mnc.py b/utils/python/MITgcmutils/tests/test_mnc.py
@@ -40,8 +40,8 @@ def test_rdmnc_eccov3():
 
 
 def test_rdmnc_cs32():
-    ds = mit.rdmnc(pjoin(TEST_DATA_PATH, 'global_ocean.cs32x15', 'run',
-                         'mnc_test_0001', 'oceDiag.*.nc'))
+    ds = mit.rdmnc(pjoin(TEST_DATA_PATH, 'global_ocean.cs32x15',
+                         'oceDiag.*.nc'))
     assert sorted(ds) == '''
     CONVADJ DRHODR GM_Kwx GM_Kwy GM_Kwz GM_PsiX GM_PsiY RHOAnoma T X Xp1 Y Yp1 diag_levels iter
     '''.split()