Bugfixes

ESMCollectionTemplate.json

@@ -23,13 +23,11 @@
       "table_id",
       "grid_label"
     ],
-    "aggregations": [{% for agg in, aggregation_control.aggregations, %}
+    "aggregations": [{% for agg in aggregations %}
       {
         "type": "{{ agg.type }}",
-        "attribute_name": "{{ agg.attribute_name }}",
-        {% if options in agg.keys() %}
-        "options": "{{ agg.options }}"
-        {% endif %}
+        "attribute_name": "{{ agg.attribute_name }}"{% if 'options' in agg %},
+        "options": "{{ agg.options }}"{% endif %}
       }{% if not loop.last %},{% endif %}
       {% endfor %}]
   }

utils.py

@@ -73,10 +73,10 @@ def make_json(catdir, project, header):
                                     'options': {'coords': 'minimal',
                                                 'compat': 'override'}})
     if project == 'CMIP6':
-        content['aggregation_control']['aggregations'].append({'type': 'join_new',
-                                                               'attribute_name': 'init_year',
-                                                               'options': {'coords': 'minimal',
-                                                                           'compat': 'override'}})
+        content['aggregations'].append({'type': 'join_new',
+                                        'attribute_name': 'init_year',
+                                        'options': {'coords': 'minimal',
+                                                    'compat': 'override'}})
 
     # Create directory if not exists.
     if not os.path.exists(os.path.dirname(catpath)):