Commit 68bbaa12 authored by Guillaume's avatar Guillaume
Browse files

Bugfixes

parent 9f212c60
......@@ -23,7 +23,7 @@
"table_id",
"grid_label"
],
"aggregations": [{% for agg in aggregations %}
"aggregations": [{% for agg in, aggregation_control.aggregations, %}
{
"type": "{{ agg.type }}",
"attribute_name": "{{ agg.attribute_name }}",
......
......@@ -7,7 +7,7 @@
"""
CATALOG_OUTPUT_BACKUP = '/modfs/backup/catalogs'
CATALOG_OUTPUT_PROD = '/modfs/catalog/catalogs'
CATALOG_OUTPUT_PROD = '/modfs/catalogs'
CATALOG_OUTPUT = '/modfs/scratch/catalogs'
IPSL_DATA_ROOT = '/bdd/'
......
......@@ -60,18 +60,18 @@ def make_json(catdir, project, header):
content['aggregation_control'] = dict()
content['aggregation_control']['variable_column_name'] = AGGREGATION_VARIABLE[project]
content['aggregation_control']['groupby_attrs'] = AGGREGATION_GROUP[project]
content['aggregation_control']['aggregations'] = list()
content['aggregation_control']['aggregations'].append({'type': 'union',
'attribute_name': 'variable_id'})
content['aggregation_control']['aggregations'].append({'type': 'join_existing',
'attribute_name': 'period_start',
'options': {'dim': 'time',
'coords': 'minimal',
'compat': 'override'}})
content['aggregation_control']['aggregations'].append({'type': 'join_new',
'attribute_name': AGGREGATION_MEMBER[project],
'options': {'coords': 'minimal',
'compat': 'override'}})
content['aggregations'] = list()
content['aggregations'].append({'type': 'union',
'attribute_name': 'variable_id'})
content['aggregations'].append({'type': 'join_existing',
'attribute_name': 'period_start',
'options': {'dim': 'time',
'coords': 'minimal',
'compat': 'override'}})
content['aggregations'].append({'type': 'join_new',
'attribute_name': AGGREGATION_MEMBER[project],
'options': {'coords': 'minimal',
'compat': 'override'}})
if project == 'CMIP6':
content['aggregation_control']['aggregations'].append({'type': 'join_new',
'attribute_name': 'init_year',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment