mkexp: always expand id for extended namelist groups

mkexp

@@ -222,6 +222,8 @@ def format_namelist(section, group=None, default_value=''):
                         if not line:
                             line = ''
                         line = re.sub(r'^#', ' !', line)
+                        # TODO next line needed to pass tests but questionable.
+                        # See 'Replace id placeholder in namelist groups' below
                         value = eval(repr(value).replace('%{id}', group_ident))
                         lines.write(' '*base_indent+key+' = '+
                                     format_value(value, indent)+
@@ -583,6 +585,16 @@ for subjob, subconfig in jobs_config.items():
         job_config['VARIABLES_'] = var_list
         for namelist, groups in job_config['namelists'].items():
             if isinstance(groups, dict):
+                # Replace id placeholder in namelist groups
+                for group_id, group in groups.items():
+                    group_base, group_ident = expconfig.section_key_info(
+                        group_id)
+                    if group_ident:
+                        for key in group.scalars:
+                            value_repr = repr(group[key])
+                            if '%{id}' in value_repr:
+                                group[key] = eval(value_repr.replace('%{id}',
+                                    group_ident))
                 # Skip hidden namelists
                 if is_set(groups.get('.hide')):
                     continue