add config.yaml option to add module dirs to MODULEPATH

payu/experiment.py

@@ -258,7 +258,7 @@ def load_modules(self):
             envmod.module('load', mod)
 
         # User-defined modules
-        user_modules = self.config.get('modules', [])
+        user_modules = self.config.get('modules', {}).get('load', [])
         for mod in user_modules:
             envmod.module('load', mod)
 
@@ -457,6 +457,10 @@ def run(self, *user_flags):
 
         # XXX: This was previously done in reversion
         envmod.setup()
+
+        # Add any user-defined module dir(s) to MODULEPATH
+        for module_dir in self.config.get('modules', {}).get('use', []):
+            envmod.module('use', module_dir) 
 
         self.load_modules()
 

payu/fsops.py

@@ -96,6 +96,12 @@ def read_config(config_fname=None):
 
     config['collate'] = collate_config
 
+    # Transform legacy modules config options
+    modules_config = config.pop('modules', {})
+    if type(modules_config) is list:
+        modules_config = {'load': modules_config}
+    config['modules'] = modules_config
+
     # Local "control" path. Must be set here so it can be
     # scanned for storage points
     config["control_path"] = config.get('control',