Templates: add option to toggle use of global config in namelist

CHANGES.txt

@@ -24,8 +24,9 @@ Templates
 
 * Allow use of iterators with 'list' and 'join' filters
 * Unify namelist and job templates. 'DEFAULT.' prefix is optional but preferred
-* Allow global config to be used in namelist templates. Original values for 
-  global variables overridden by namelist settings are in section '_'
+* Add option to use global config in namelist templates (.use_full_config).
+  Original values for global variables overridden by namelist settings
+  are kept in section '_'
 
 Tools
 -----

mkexp

@@ -591,18 +591,23 @@ for subjob, subconfig in jobs_config.items():
                 namelist_name = re.sub(r'\W', '_', namelist.upper())
                 use_template = (groups.get('.use_template') or
                                 groups.get('use_template') or '')
-                if use_template:
-                    if use_template.lower() == 'true':
-                        use_template = namelist
+                use_full_config = groups.get('.use_full_config', '')
+                if use_full_config.lower() == 'true':
                     namelist_config = ConfigObj(job_config)
                     namelist_config['_'] = job_config
                     namelist_config.merge(expconfig.odict(groups))
                     expconfig.merge_comments(namelist_config, groups)
+                else:
+                    namelist_config = groups
+                if use_template:
+                    if use_template.lower() == 'true':
+                        use_template = namelist
                     job_config[namelist_name] = expand_template(
                         namelist_config, get_exp_template_names(
                             experiment_config_id, config, use_template))
                 else:
-                    job_config[namelist_name] = format_namelist(groups)
+                    job_config[namelist_name] = format_namelist(
+                        namelist_config)
 
         # Generate job script
         template_search_list = ()

test.py

@@ -847,7 +847,7 @@ class NamelistTemplateTestCase(MkexpSimpleTestCase):
                    value = 42
         """)
 
-    def test_globals_in_template(self):
+    def test_full_config_in_template(self):
         writetemplate(self.exp_id, 'namelist_template', u"""
             %{EXP_ID}
             %{value}
@@ -868,11 +868,36 @@ class NamelistTemplateTestCase(MkexpSimpleTestCase):
             [namelists]
               [[namelist]]
                 .use_template = namelist_template
+                .use_full_config = true
                 value = namelist
                 [[[group]]]
                    value = group 
         """)
 
+    def test_normal_config_in_template(self):
+        writetemplate(self.exp_id, 'namelist_template', u"""
+#%  for key, value in context().get_all().items():
+#%    if not key.startswith('.') and not value is callable:
+%{key}
+#%    endif
+#%  endfor
+        """)
+        self.run_test(u"""
+            %{NAMELIST}
+        """, u"""
+            value
+            group
+        """, u"""
+            value = global
+            [namelists]
+              [[namelist]]
+                .use_template = namelist_template
+                value = namelist
+                [[[group]]]
+                   value = group 
+        """)
+
+
 class KeySplittingTestCase(MkexpSimpleTestCase):
 
     def test_job_splitting(self):