Read pickup MDS

xmitgcm/test/test_utils.py

@@ -20,11 +20,26 @@
  nrecords = [     1 ];
 """
 
+_pk_meta_content = """
+ nDims = [   2 ];
+ dimList = [
+   192,    1,   192,
+    32,    1,   32
+ ];
+ dataprec = [ 'float64' ];
+ nrecords = [   123 ];
+ timeStepNumber = [      72000 ];
+ nFlds = [   11 ];
+ fldList = {
+ 'Uvel    ' 'GuNm1   ' 'Vvel    ' 'GvNm1   ' 'Theta   ' 'GtNm1   ' 'Salt    ' 'GsNm1   ' 'EtaN    ' 'dEtaHdt ' 'EtaH    '
+ };
+"""
 
 def test_parse_meta(tmpdir):
     """Check the parsing of MITgcm .meta into python dictionary."""
 
     from xmitgcm.utils import parse_meta_file
+    print(tmpdir)
     p = tmpdir.join("XC.meta")
     p.write(_xc_meta_content)
     fname = str(p)
@@ -41,6 +56,38 @@ def test_parse_meta(tmpdir):
         assert result[k] == v
 
 
+def test_parse_pickup_meta(tmpdir):
+    """Check the parsing of MITgcm pickup .meta into python dictionary."""
+
+    from xmitgcm.utils import parse_meta_file
+    p = tmpdir.join("pickup.0000000000.meta")
+    p.write(_pk_meta_content)
+    fname = str(p)
+    result = parse_meta_file(fname)
+    expected = {
+        'basename': 'pickup',
+        'nDims': 2,
+        'dimList': [[192, 1, 192], [32, 1, 32]],
+        'dataprec': np.dtype('float64'),
+        'nrecords': 123,
+        'timeStepNumber': '72000',
+        'nFlds': '11',
+        'fldList': ['Uvel',
+                    'GuNm1',
+                    'Vvel',
+                    'GvNm1',
+                    'Theta',
+                    'GtNm1',
+                    'Salt',
+                    'GsNm1',
+                    'EtaN',
+                    'dEtaHdt',
+                    'EtaH']
+    }
+    for k, v in expected.items():
+        assert result[k] == v
+
+
 @pytest.mark.parametrize("dtype", [np.dtype('f8'), np.dtype('f4'), np.dtype('i4')])
 def test_read_raw_data(tmpdir, dtype):
     """Check our utility for reading raw data."""

xmitgcm/utils.py

@@ -60,7 +60,10 @@ def parse_meta_file(fname):
     if 'fldList' in flds:
         flds['fldList'] = [re.match(r"'*(\w+)", g).groups()[0] for g in
                            re.split(r"'\s+'", flds['fldList'])]
-        assert flds['nrecords'] == len(flds['fldList'])
+        if 'nFlds' in flds:
+            assert int(flds['nFlds']) == len(flds['fldList'])
+        else:
+            assert flds['nrecords'] == len(flds['fldList'])
     return flds
 
 def _get_useful_info_from_meta_file(metafile):