diff --git a/models/examples/gfdl_cm3/schemas/output/gfdl_cm3.json b/models/examples/gfdl_cm3/schemas/output/gfdl_cm3.json index b46bde4..f9ac2b4 100644 --- a/models/examples/gfdl_cm3/schemas/output/gfdl_cm3.json +++ b/models/examples/gfdl_cm3/schemas/output/gfdl_cm3.json @@ -19,7 +19,7 @@ "type": "object", "properties":{ "data": {"type": "object"}, - "granularity": {"type": "string", "value": "global"} + "granularity": {"type": "null"} } } }, diff --git a/models/examples/gfdl_cm3/src/inner_wrapper.py b/models/examples/gfdl_cm3/src/inner_wrapper.py index 07e85df..0dcb829 100644 --- a/models/examples/gfdl_cm3/src/inner_wrapper.py +++ b/models/examples/gfdl_cm3/src/inner_wrapper.py @@ -36,8 +36,8 @@ class InnerWrapper(OuterWrapper): results = { 'gfdl_cm3': { 'global_temp': { - 'data': {'temp': self.global_temp}, - 'granularity': 'global', + 'data': {'global_temp': self.global_temp}, + 'granularity': None, }, 'precipitation': { 'data': self.precipitation, diff --git a/outer_wrapper.py b/outer_wrapper.py index 4bb397f..acc3420 100755 --- a/outer_wrapper.py +++ b/outer_wrapper.py @@ -188,7 +188,7 @@ class OuterWrapper(ABC): ' ".*": {' ' "type": "object", ' ' "properties": {' - ' "data": {"type": "object"}, "granularity": {"type": "string"}' + ' "data": {"type": "object"}, "granularity": {"type": ["string", "null"]}' ' },' ' "required": ["data", "granularity"]' ' }'