Sfields are properly labeled

Author: amorison

stagpy/phyvars.py

@@ -83,13 +83,26 @@
 ))
 
 SFIELD = OrderedDict((
-    ('geoid', Varf('Geoid', 'm')),
-    ('topo', Varf('Topography', 'm')),
+    ('topo_top', Varf('Topography at top', 'm')),
+    ('topo_bot', Varf('Topography at bottom', 'm')),
+    ('geoid_top', Varf('Geoid at top', 'm')),
+    ('geoid_bot', Varf('Geoid at bottom', 'm')),
+    ('topo_g_top', Varf('Topography for geoid at top', 'm')),
+    ('topo_g_bot', Varf('Topography for geoid at bottom', 'm')),
+    ('ftop', Varf('Heat flux at top', 'W/m2')),
+    ('fbot', Varf('Heat flux at bottom', 'W/m2')),
+    ('fstop', Varf('Heat flux from spectrum at top', 'W/m2')),
+    ('fsbot', Varf('Heat flux from spectrum at bottom', 'W/m2')),
+    ('crust', Varf('Crustal thickness', 'm')),
 ))
 
 SFIELD_FILES = OrderedDict((
-    ('g', ['geoid']),
-    ('cs', ['topo']),
+    ('cs', ['topo_bot', 'topo_top']),
+    ('g', ['geoid_bot', 'geoid_top']),
+    ('csg', ['topo_g_bot', 'topo_g_top']),
+    ('hf', ['fbot', 'ftop']),
+    ('hfs', ['fsbot', 'fstop']),
+    ('cr', ['crust']),
 ))
 
 Varr = namedtuple('Varr', ['description', 'kind', 'dim'])

stagpy/stagyyparsers.py

@@ -377,10 +377,13 @@ def fields(fieldfile, only_header=False, only_istep=False):
 
         # check nb components
         nval = 1
+        sfield = False
         if magic > 400:
             nval = 4
         elif magic > 300:
             nval = 3
+        elif magic > 100:
+            sfield = True
 
         magic %= 100
 
@@ -469,6 +472,9 @@ def fields(fieldfile, only_header=False, only_istep=False):
                  ] = np.transpose(data_cpu.reshape(
                      (nbk, npc[2], npc[1] + header['xyp'],
                       npc[0] + header['xyp'], nval)))
+        if sfield:
+            # for surface fields, variables are written along z direction
+            flds = np.swapaxes(flds, 0, 3)
     return header, flds