From 1310f3fc76d422c07a8f45f5e9e0513432dff619 Mon Sep 17 00:00:00 2001
From: Karl-Hermann Wieners <karl-hermann.wieners@mpimet.mpg.de>
Date: Wed, 24 Jul 2024 13:54:54 +0200
Subject: [PATCH] Global: move default config/tmpl to mkexp/
---
CHANGES.rst | 2 +-
mkexp | 4 ++--
test/mkexp/{types => }/namelist.tmpl | 0
3 files changed, 3 insertions(+), 3 deletions(-)
rename test/mkexp/{types => }/namelist.tmpl (100%)
diff --git a/CHANGES.rst b/CHANGES.rst
index fe0a74e..da6156e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -13,7 +13,7 @@ Global
---------
* Move ``standard_*`` directories to ``mkexp/*``,
- rename ``experiments`` to ``types``.
+ rename ``experiments`` to ``types``, move defaults to ``mkexp/``.
``standard_*`` is still supported
Templates
diff --git a/mkexp b/mkexp
index f72994f..6966fee 100755
--- a/mkexp
+++ b/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.typ_lib_path),
- get_template_name(job_or_namelist, ExpConfig.typ_lib_path),
+ ExpConfig.lib_dir),
+ get_template_name(job_or_namelist, ExpConfig.lib_dir),
# Legacy directory structure
get_exp_template_name(config.experiment_kind, job_or_namelist),
get_exp_template_name(ExpConfig.default_name, job_or_namelist),
diff --git a/test/mkexp/types/namelist.tmpl b/test/mkexp/namelist.tmpl
similarity index 100%
rename from test/mkexp/types/namelist.tmpl
rename to test/mkexp/namelist.tmpl
--
GitLab