Remove multi-run logic from calc #178
Conversation
There was a problem hiding this comment.
Thanks for taking care of this cleanup!
I think the test failures may be related to dask/distributed#1056
aospy/calc.py
Outdated
| raise ValueError("`dtype_in_vert` must be either 'pressure' or " | ||
| "'sigma' for pressure data") | ||
|
|
||
| def _get_input_data(self, var, start_date, end_date, n): | ||
| def _get_input_data(self, var, start_date, end_date): | ||
| """Get the data for a single variable over the desired date range.""" | ||
| logging.info(self._print_verbose("Getting input data:", var)) | ||
| # If only 1 run, use it to load all data. Otherwise assume that num |
There was a problem hiding this comment.
Is this comment still relevant?
There was a problem hiding this comment.
Good call, will go through all the comments looking for anything else along these lines.
|
Fixed that comment and snuck in some other minor cleanup in calc.py
@spencerkclark I think you're right. Funny that it's not happening for 3.4. I'm comfortable merging as is despite those failures; let me know if you agree. Tests are all passing on my local machine. |
docs/whats-new.rst
Outdated
| @@ -30,6 +30,10 @@ Dependencies | |||
| Bug Fixes | |||
| ~~~~~~~~~ | |||
|
|
|||
| - Remove faulty logic for calculations with data coming from multiple | |||
| runs. Eventually this feature will be properly implemented (fixes | |||
| :issue:`###` via :pull:`17#`). By `Spencer Hill | |||
There was a problem hiding this comment.
Oops! another good catch
|
Great, thanks! |
Closes #117
Of course we do eventually want to re-implement this, but good in the meantime to get rid of this really ugly and confusing code.