diff --git a/user-analysis-scripts/freanalysis_radiation_atmos_av_mon/freanalysis_radiation_atmos_av_mon/__init__.py b/user-analysis-scripts/freanalysis_radiation_atmos_av_mon/freanalysis_radiation_atmos_av_mon/__init__.py index ed300a7..7f8becc 100644 --- a/user-analysis-scripts/freanalysis_radiation_atmos_av_mon/freanalysis_radiation_atmos_av_mon/__init__.py +++ b/user-analysis-scripts/freanalysis_radiation_atmos_av_mon/freanalysis_radiation_atmos_av_mon/__init__.py @@ -252,16 +252,20 @@ def plot_vs_obs(self, catalog, reference_catalog, frequency, if config: query_params.update(config) - pdb.set_trace() - datasets = model_catalog.search(**query_params).to_dataset_dict(progressbar=False) + #pdb.set_trace() + search_results = model_catalog.search(**query_params) + print("model search results returned") + datasets = search_results.to_dataset_dict(progressbar=False) if len(list(datasets.values())) != 1: print(query_params, list(datasets.values())) raise ValueError("could not filter the catalog down to a single dataset.") dataset = list(datasets.values())[0] + print("Model dataset created") # Model Lon-lat maps. model_map = LonLatMap.from_xarray_dataset(dataset, variable, time_index=0, time_method="instantaneous") + print("Model map created") # Connect to the reference catalog and get the reference datasets. obs_catalog = intake.open_esm_datastore(reference_catalog) @@ -269,10 +273,13 @@ def plot_vs_obs(self, catalog, reference_catalog, frequency, "experiment_id": "ceres_ebaf_ed4.1", "variable_id": reference_variable, } - datasets = obs_catalog.search(**query_params).to_dataset_dict(progressbar=False) + search_results = obs_catalog.search(**query_params) + print("obs search results returned") + datasets = search_results.to_dataset_dict(progressbar=False) if len(list(datasets.values())) != 1: raise ValueError("could not filter the catalog down to a single dataset.") dataset = list(datasets.values())[0] + print("Obs dataset created") if month_range == None: period = "annual" @@ -293,11 +300,17 @@ def plot_vs_obs(self, catalog, reference_catalog, frequency, dataset, reference_variable, f"{period} climatology", year_range=[2003, 2018], month_range=month_range, ) + print("obs map created") obs_map.regrid_to_map(model_map) + print("obs map regridded") figure = chuck_radiation(model_map, obs_map, f"{title}") + print("chuck radiation") + #breakpoint() output = Path(png_dir) / f"{title.lower().replace(' ', '-')}.png" + print("path determined") figure.save(output) + print("figure saved") return output diff --git a/user-analysis-scripts/freanalysis_radiation_atmos_av_mon/pyproject.toml b/user-analysis-scripts/freanalysis_radiation_atmos_av_mon/pyproject.toml index e5a28a4..cfe80b2 100644 --- a/user-analysis-scripts/freanalysis_radiation_atmos_av_mon/pyproject.toml +++ b/user-analysis-scripts/freanalysis_radiation_atmos_av_mon/pyproject.toml @@ -9,7 +9,7 @@ name = "freanalysis_radiation_atmos_av_mon" version = "0.1" dependencies = [ "intake", - "intake-esm", + "intake-esm@git+https://github.com/intake/intake-esm#egg=eb15a2fb4db9c1d9011761eab8d0f64d39ca69f8", ] requires-python = ">= 3.6" authors = [