mirror of
https://github.com/JHUAPL/SIMoN.git
synced 2026-01-10 15:28:00 -05:00
making correction to the merge
Former-commit-id: 36a454d2dd0e297e37e22bd0bfadb6c1b78179fe
This commit is contained in:
@@ -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():
|
||||
|
||||
Reference in New Issue
Block a user