Repository: climate Updated Branches: refs/heads/master 677173e11 -> 0e55cc15c
CLIMATE-867 - CLI error - The temporal regridding in cli_app.py has been updated. Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/0b6f4b2d Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/0b6f4b2d Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/0b6f4b2d Branch: refs/heads/master Commit: 0b6f4b2d8f9bd80af50d13e249803a33d225b0d5 Parents: 677173e Author: huikyole <huiky...@argo.jpl.nasa.gov> Authored: Fri Sep 9 09:43:52 2016 -0700 Committer: huikyole <huiky...@argo.jpl.nasa.gov> Committed: Fri Sep 9 09:43:52 2016 -0700 ---------------------------------------------------------------------- RCMES/cli_app.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/0b6f4b2d/RCMES/cli_app.py ---------------------------------------------------------------------- diff --git a/RCMES/cli_app.py b/RCMES/cli_app.py index 22572db..58e8cb2 100644 --- a/RCMES/cli_app.py +++ b/RCMES/cli_app.py @@ -643,11 +643,11 @@ def run_screen(model_datasets, models_info, observations_info, for member, each_target_dataset in enumerate(new_model_datasets): new_model_datasets[member] = dsp.temporal_rebin(new_model_datasets[member], temp_grid_setting.lower()) - if each_target_dataset.lats.ndim !=2 and each_target_dataset.lons.ndim !=2: - new_model_datasets[member] = dsp.subset(EVAL_BOUNDS, new_model_datasets[member]) - else: - new_model_datasets[member] = dsp.temporal_slice( - each_target_dataset, EVAL_BOUNDS.start, EVAL_BOUNDS.end) + new_model_datasets[member] = dsp.normalize_dataset_datetimes(new_model_datasets[member], temp_grid_setting.lower()) + start_index = np.where(new_model_datasets[member].times >= overlap_start_time)[0][0] + end_index = np.where(new_model_datasets[member].times <= overlap_end_time)[0][-1] + new_model_datasets[member].values=each_target_dataset.values[start_index:end_index+1,:] + new_model_datasets[member].times=each_target_dataset.times[start_index:end_index+1] screen.addstr(5, 4, "--> Temporally regridded.") screen.refresh()
