Bump loam to 0.4.0

Author: amorison

setup.py

@@ -32,7 +32,7 @@
     },
     include_package_data=True,
     install_requires=[
-        'loam>=0.3.1',
+        'loam>=0.4.0',
         'f90nml>=1.3.1',
         'setuptools_scm>=6.2',
         'numpy>=1.19',

stagpy/args.py

@@ -55,7 +55,7 @@ def parse_args(arglist=None):
 
     create_complete_files(climan, CONFIG_DIR, 'stagpy', zsh_sourceable=True)
 
-    cmd_args, all_subs = climan.parse_args(arglist)
+    cmd_args = climan.parse_args(arglist)
     sub_cmd = cmd_args.loam_sub_name
 
     if sub_cmd is None:
@@ -68,7 +68,7 @@ def parse_args(arglist=None):
         set_conf_str(conf, conf.common.set)
 
     if conf.common.config:
-        commands.config_pp(all_subs)
+        commands.config_pp(climan.sections_list(sub_cmd))
 
     load_mplstyle()
 

stagpy/config.py

@@ -8,7 +8,8 @@
 import pathlib
 
 from loam.manager import ConfOpt as Conf
-from loam.tools import switch_opt, config_conf_section, set_conf_opt
+from loam import tools
+from loam.tools import switch_opt, command_flag
 
 
 def _slice_or_int(arg):
@@ -45,9 +46,8 @@ def parser(arg):
 CONF_DEF = OrderedDict()
 
 CONF_DEF['common'] = OrderedDict((
-    ('config', Conf(None, True, None, {'action': 'store_true'},
-                    False, 'print config options')),
-    ('set', set_conf_opt()),
+    ('config', command_flag(None, 'print config options')),
+    ('set', tools.set_conf_opt()),
 ))
 
 CONF_DEF['core'] = OrderedDict((
@@ -215,16 +215,11 @@ def parser(arg):
 ))
 
 CONF_DEF['var'] = OrderedDict((
-    ('field', Conf(None, True, None, {'action': 'store_true'},
-                   False, 'print field variables')),
-    ('sfield', Conf(None, True, None, {'action': 'store_true'},
-                    False, 'print surface field variables')),
-    ('rprof', Conf(None, True, None, {'action': 'store_true'},
-                   False, 'print rprof variables')),
-    ('time', Conf(None, True, None, {'action': 'store_true'},
-                  False, 'print time variables')),
-    ('refstate', Conf(None, True, None, {'action': 'store_true'},
-                      False, 'print refstate variables')),
+    ('field', command_flag(None, 'print field variables')),
+    ('sfield', command_flag(None, 'print surface field variables')),
+    ('rprof', command_flag(None, 'print rprof variables')),
+    ('time', command_flag(None, 'print time variables')),
+    ('refstate', command_flag(None, 'print refstate variables')),
 ))
 
-CONF_DEF['config'] = config_conf_section()
+CONF_DEF['config'] = tools.config_conf_section()

stagpy/plates.py

@@ -293,12 +293,10 @@ def plot_scalar_field(snap, fieldname):
         c_field = np.ma.masked_where(
             ~_continents_location(snap, at_surface=False),
             snap.fields['c'].values[0, :, :, 0])
-        cbar = conf.field.colorbar
-        conf.field.colorbar = False
         cmap = colors.ListedColormap(["k", "g", "m"])
-        field.plot_scalar(snap, 'c', c_field, axis, cmap=cmap,
-                          norm=colors.BoundaryNorm([2, 3, 4, 5], cmap.N))
-        conf.field.colorbar = cbar
+        with conf.field.context_(colorbar=False):
+            field.plot_scalar(snap, 'c', c_field, axis, cmap=cmap,
+                              norm=colors.BoundaryNorm([2, 3, 4, 5], cmap.N))
 
     # plotting velocity vectors
     field.plot_vec(axis, snap, 'sx' if conf.plates.stress else 'v')