You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by hu...@apache.org on 2016/01/14 02:29:33 UTC
[1/2] climate git commit: CLIMATE-716 - Dataset object manipulation
when plotting a Taylor diagram using a configuration file
Repository: climate
Updated Branches:
refs/heads/master 92ae043c4 -> 7461d1b7b
CLIMATE-716 - Dataset object manipulation when plotting a Taylor diagram using a configuration file
- examples/configuration_file_examples/metrics_and_plots.Taylor_diagram_spatial_pattern_of_multiyear_climatology 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/0149fd96
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/0149fd96
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/0149fd96
Branch: refs/heads/master
Commit: 0149fd96e6e0e8e01bfae3728b4cb931577753cb
Parents: 92ae043
Author: huikyole <hu...@argo.jpl.nasa.gov>
Authored: Wed Jan 6 21:04:30 2016 -0800
Committer: huikyole <hu...@argo.jpl.nasa.gov>
Committed: Wed Jan 6 21:04:30 2016 -0800
----------------------------------------------------------------------
.../configuration_file_examples/metrics_and_plots.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/0149fd96/examples/configuration_file_examples/metrics_and_plots.py
----------------------------------------------------------------------
diff --git a/examples/configuration_file_examples/metrics_and_plots.py b/examples/configuration_file_examples/metrics_and_plots.py
index ac32c85..6e00b0f 100644
--- a/examples/configuration_file_examples/metrics_and_plots.py
+++ b/examples/configuration_file_examples/metrics_and_plots.py
@@ -16,6 +16,7 @@
# under the License.
#Apache OCW lib immports
+import ocw.dataset as ds
import ocw.data_source.local as local
import ocw.plotter as plotter
import ocw.utils as utils
@@ -44,7 +45,6 @@ def Map_plot_bias_of_multiyear_climatology(obs_dataset, obs_name, model_datasets
bias_evaluation = Evaluation(obs_dataset, # Reference dataset for the evaluation
model_datasets, # list of target datasets for the evaluation
[map_of_bias, map_of_bias])
-
# run the evaluation (bias calculation)
bias_evaluation.run()
@@ -78,6 +78,7 @@ def Map_plot_bias_of_multiyear_climatology(obs_dataset, obs_name, model_datasets
plt.colorbar(max, cax = cax)
clevs = plotter._nice_intervals(rcm_bias, 11)
for imodel in np.arange(len(model_datasets)):
+
ax = fig.add_subplot(row, column,2+imodel)
if map_projection == 'npstere':
m = Basemap(ax=ax, projection ='npstere', boundinglat=lat_min, lon_0=0,
@@ -102,17 +103,18 @@ def Taylor_diagram_spatial_pattern_of_multiyear_climatology(obs_dataset, obs_nam
file_name):
# calculate climatological mean fields
- obs_dataset.values = utils.calc_temporal_mean(obs_dataset)
+ obs_clim_dataset = ds.Dataset(obs_dataset.lats, obs_dataset.lons, obs_dataset.times, utils.calc_temporal_mean(obs_dataset))
+ model_clim_datasets = []
for dataset in model_datasets:
- dataset.values = utils.calc_temporal_mean(dataset)
+ model_clim_datasets.append(ds.Dataset(dataset.lats, dataset.lons, dataset.times, utils.calc_temporal_mean(dataset)))
# Metrics (spatial standard deviation and pattern correlation)
# determine the metrics
taylor_diagram = metrics.SpatialPatternTaylorDiagram()
# create the Evaluation object
- taylor_evaluation = Evaluation(obs_dataset, # Reference dataset for the evaluation
- model_datasets, # list of target datasets for the evaluation
+ taylor_evaluation = Evaluation(obs_clim_dataset, # Climatological mean of reference dataset for the evaluation
+ model_clim_datasets, # list of climatological means from model datasets for the evaluation
[taylor_diagram])
# run the evaluation (bias calculation)
[2/2] climate git commit:
examples/configuration_file_examples/metrics_and_plots.Taylor_diagram_spatial_pattern_of_multiyear_climatology
has been updated.
Posted by hu...@apache.org.
examples/configuration_file_examples/metrics_and_plots.Taylor_diagram_spatial_pattern_of_multiyear_climatology 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/7461d1b7
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/7461d1b7
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/7461d1b7
Branch: refs/heads/master
Commit: 7461d1b7b82249086d9ed8a241dbdedc02d19f54
Parents: 92ae043 0149fd9
Author: huikyole <hu...@argo.jpl.nasa.gov>
Authored: Wed Jan 13 17:29:12 2016 -0800
Committer: huikyole <hu...@argo.jpl.nasa.gov>
Committed: Wed Jan 13 17:29:12 2016 -0800
----------------------------------------------------------------------
.../configuration_file_examples/metrics_and_plots.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------