Changed script generation to allow suppressing of default jobs by 'remove'...

Changed script generation to allow suppressing of default jobs by 'remove' keyword in 'jobs' section

mkexp

@@ -206,24 +206,32 @@ for namelist, groups in config['namelists'].iteritems():
 
 # Cut queue specific settings
 job_dict = {}
+remove_list = []
 for key, value in config['jobs'].iteritems():
     if not isinstance(value, dict):
-        job_dict[key] = value
+        if key == 'remove':
+            if isinstance(value, basestring):
+                remove_list = [value]
+            else:
+                remove_list = value
+        else:
+            job_dict[key] = value
         del config['jobs'][key]
 
 # Paste them into each job
 for subjob, subconfig in config['jobs'].iteritems():
-    subconfig.merge(job_dict)
-    subconfig['id'] = subjob
-    template_job = subjob
-    if 'extends' in subconfig:
-        template_job = subconfig['extends']
-    subconfig['tasks'] = int(subconfig.get('nodes', 1)) * \
-                         int(subconfig.get('tasks_per_node', 1))
-    config['JOB'] = subconfig
-    expand_template(config,
-                    get_template_name(config.experiment_kind, template_job),
-                    get_script_name(config.experiment_id, subjob))
+    if not subjob in remove_list:
+        subconfig.merge(job_dict)
+        subconfig['id'] = subjob
+        template_job = subjob
+        if 'extends' in subconfig:
+            template_job = subconfig['extends']
+        subconfig['tasks'] = int(subconfig.get('nodes', 1)) * \
+                             int(subconfig.get('tasks_per_node', 1))
+        config['JOB'] = subconfig
+        expand_template(config,
+                        get_template_name(config.experiment_kind, template_job),
+                        get_script_name(config.experiment_id, subjob))
 
 # Create README file from experiment description