making correction to the merge

Former-commit-id: 36a454d2dd0e297e37e22bd0bfadb6c1b78179fe
This commit is contained in:
Michael T. Kelbaugh
2019-07-25 12:11:15 -04:00
parent 5d4545e5dc
commit 56595da125

View File

@@ -23,9 +23,9 @@ class InnerWrapper(OuterWrapper):
print('rcp data not found')
def increment(self, **kwargs):
self.mean_temp, self.climate_data = temp_inc(self.raw_data, self.incstep)
self.global_temp, self.climate_data = temp_inc(self.raw_data, self.incstep)
return {'rcp_climate': {'global_temp': {'data': {'temp': self.mean_temp}, 'granularity': 'global'}, 'rcp': {'data': {}, 'granularity': 'climate'}}}
return {'rcp_climate': {'global_temp': {'data': {'temp': self.global_temp}, 'granularity': 'global'}, 'rcp': {'data': self.climate_data, 'granularity': 'climate'}}}
def main():