Global: move mkexp/*.* to mkexp/defaults/

CHANGES.rst

@@ -13,7 +13,7 @@ Global
 ---------
 
 * Move ``standard_*`` directories to ``mkexp/*``,
-  rename ``experiments`` to ``types``, move defaults to ``mkexp/``.
+  rename ``experiments`` to ``types``, move defaults to ``mkexp/defaults``.
   ``standard_*`` is still supported
 
 Templates

expconfig.py

@@ -123,6 +123,7 @@ class ExpConfig(ConfigObj):
 
     # Updated directory structure
     lib_dir = 'mkexp'
+    def_lib_path = os.path.join(lib_dir, 'defaults')
     typ_lib_path = os.path.join(lib_dir, 'types')
     env_lib_path = os.path.join(lib_dir, 'environments')
     opt_lib_path = os.path.join(lib_dir, 'options')
@@ -511,7 +512,7 @@ class ExpConfig(ConfigObj):
 
         # Read experiment settings from library (default and type specific)
 
-        lib_config_name = get_config_name([our.lib_dir, our.exp_lib_dir],
+        lib_config_name = get_config_name([our.def_lib_path, our.exp_lib_dir],
             our.default_name+'.config')
         if lib_config_name:
             pre_config.merge(ConfigObj(lib_config_name))

mkexp

@@ -67,8 +67,8 @@ def get_exp_template_names(experiment_config_id, config, job_or_namelist):
         get_exp_template_name(config.experiment_kind, job_or_namelist,
                               ExpConfig.typ_lib_path),
         get_exp_template_name(ExpConfig.default_name, job_or_namelist,
-                              ExpConfig.lib_dir),
-        get_template_name(job_or_namelist, ExpConfig.lib_dir),
+                              ExpConfig.def_lib_path),
+        get_template_name(job_or_namelist, ExpConfig.def_lib_path),
         # Legacy directory structure
         get_exp_template_name(config.experiment_kind, job_or_namelist),
         get_exp_template_name(ExpConfig.default_name, job_or_namelist),

test/legacy/standard_experiments/DEFAULT.config

-../../mkexp/DEFAULT.config
\ No newline at end of file
+../../mkexp/defaults/DEFAULT.config
\ No newline at end of file

test/legacy/standard_experiments/namelist.tmpl

-../../mkexp/types/namelist.tmpl
\ No newline at end of file
+../../mkexp/defaults/namelist.tmpl
\ No newline at end of file