Changed exp key in metadata.yml for concatenated experiments

Author: schlunma

esmvaltool/_data_finder.py

@@ -269,7 +269,7 @@ def get_output_file(variable, preproc_dir):
     cfg = get_project_config(variable['project'])
 
     # Join different experiment names
-    if isinstance(variable['exp'], (list, tuple)):
+    if isinstance(variable.get('exp'), (list, tuple)):
         variable = dict(variable)
         variable['exp'] = '-'.join(variable['exp'])
 

esmvaltool/preprocessor/_io.py

@@ -216,6 +216,9 @@ def write_metadata(products, write_ncl=False):
         )
         metadata = OrderedDict()
         for product in sorted_products:
+            if isinstance(product.attributes.get('exp'), (list, tuple)):
+                product.attributes = dict(product.attributes)
+                product.attributes['exp'] = '-'.join(product.attributes['exp'])
             metadata[product.filename] = product.attributes
 
         output_filename = os.path.join(output_dir, 'metadata.yml')