Repository: climate Updated Branches: refs/heads/master 91ec7f31c -> ddae7589c
Changed all instances of 'data_source' to 'loader_name' Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/711f86ba Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/711f86ba Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/711f86ba Branch: refs/heads/master Commit: 711f86ba3533aa42cfd8190aac8edcc1e814413f Parents: 7ab0141 Author: Alex Goodman <[email protected]> Authored: Wed Aug 3 10:20:26 2016 -0700 Committer: Alex Goodman <[email protected]> Committed: Wed Aug 3 10:20:26 2016 -0700 ---------------------------------------------------------------------- .../CORDEX-Africa_examples/Fig10a_cru.yaml | 4 +- .../CORDEX-Africa_examples/Fig10b_cru.yaml | 4 +- .../CORDEX-Africa_examples/Fig1_2_4a_5.yaml | 14 +- .../CORDEX-Africa_examples/Fig3a_summer.yaml | 4 +- .../CORDEX-Africa_examples/Fig3a_winter.yaml | 4 +- .../CORDEX-Africa_examples/Fig3b_summer.yaml | 4 +- .../CORDEX-Africa_examples/Fig3b_winter.yaml | 4 +- .../CORDEX-Africa_examples/Fig4d_7d_8ad.yaml | 4 +- .../CORDEX-Africa_examples/Fig4f_9bcd.yaml | 4 +- .../CORDEX-Africa_examples/Fig7e_8be.yaml | 4 +- .../CORDEX-Africa_examples/Fig7f_8cf.yaml | 4 +- ...ordex-arctic_cloud_fraction_bias_to_SRB.yaml | 4 +- .../cordex-arctic_rlds_bias_to_SRB.yaml | 4 +- .../cordex-arctic_rlus_bias_to_SRB.yaml | 4 +- .../cordex-arctic_rsds_bias_to_SRB.yaml | 4 +- .../ESGF_example/ESGF-Example.yaml | 4 +- .../ESGF_example/ESGF-Example_local.yaml | 4 +- .../NARCCAP_examples/Fig10_and_Fig11.yaml | 4 +- .../NARCCAP_examples/Fig12_summer.yaml | 4 +- .../NARCCAP_examples/Fig12_winter.yaml | 4 +- .../NARCCAP_examples/Fig14_and_Fig15.yaml | 4 +- .../NARCCAP_examples/Fig16_summer.yaml | 4 +- .../NARCCAP_examples/Fig16_winter.yaml | 4 +- .../NARCCAP_examples/Fig5_and_Fig6.yaml | 4 +- .../NARCCAP_examples/Fig7_summer.yaml | 4 +- .../NARCCAP_examples/Fig7_winter.yaml | 4 +- .../NARCCAP_examples/Fig8_and_Fig9.yaml | 4 +- .../dscale_prmo-eus_rcmed.yaml | 4 +- .../dscale_prmo-wus_local.yaml | 4 +- .../dscale_prmo-wus_rcmed.yaml | 4 +- .../dscale_wus_prec_trmm_vs_nldas.yaml | 4 +- ...prec_subregion_annual_cycle_time_series.yaml | 4 +- RCMES/run_RCMES.py | 129 +++++++++---------- 33 files changed, 131 insertions(+), 136 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/CORDEX-Africa_examples/Fig10a_cru.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/CORDEX-Africa_examples/Fig10a_cru.yaml b/RCMES/configuration_files/CORDEX-Africa_examples/Fig10a_cru.yaml index 32f6f0b..14f176f 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig10a_cru.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig10a_cru.yaml @@ -25,14 +25,14 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 42 multiplying_factor: 0.01 targets: - data_source: local + loader_name: local path: ./data/CORDEX-Africa_data/AFRICA*clt.nc variable: clt latitude_name: lat http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/CORDEX-Africa_examples/Fig10b_cru.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/CORDEX-Africa_examples/Fig10b_cru.yaml b/RCMES/configuration_files/CORDEX-Africa_examples/Fig10b_cru.yaml index eef6e6b..10c64e0 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig10b_cru.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig10b_cru.yaml @@ -25,13 +25,13 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 37 targets: - data_source: local + loader_name: local path: ./data/CORDEX-Africa_data/AFRICA*pr.nc variable: pr http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/CORDEX-Africa_examples/Fig1_2_4a_5.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/CORDEX-Africa_examples/Fig1_2_4a_5.yaml b/RCMES/configuration_files/CORDEX-Africa_examples/Fig1_2_4a_5.yaml index 430213a..405245b 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig1_2_4a_5.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig1_2_4a_5.yaml @@ -1,10 +1,10 @@ workdir: ./ output_netcdf_filename: Fig1_2_4a_5.nc -# (RCMES will temporally subset data between month_start and month_end. +# (RCMES will temporally subset data between month_start and month_end. # If average_each_year is True (False), seasonal mean in each year is (not) calculated and used for metrics calculation.) time: - maximum_overlap_period: True + maximum_overlap_period: True start_time: 1990-01-01 end_time: 2007-12-31 temporal_resolution: monthly @@ -25,15 +25,15 @@ regrid: datasets: reference: - data_source: rcmed - data_name: CRU + loader_name: rcmed + data_name: CRU dataset_id: 10 parameter_id: 37 targets: - data_source: local + loader_name: local path: ./data/CORDEX-Africa_data/AFRICA*pr.nc - variable: pr + variable: pr number_of_metrics_and_plots: 4 @@ -59,7 +59,7 @@ metrics4: Portrait_diagram_subregion_annual_cycle plots4: file_name: Fig5k-l -use_subregions: True +use_subregions: True subregions: #subregion name (R01, R02, R03,....) followed by an array of boundaries [south, north, west, east] http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/CORDEX-Africa_examples/Fig3a_summer.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/CORDEX-Africa_examples/Fig3a_summer.yaml b/RCMES/configuration_files/CORDEX-Africa_examples/Fig3a_summer.yaml index c1fbee2..25f5794 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig3a_summer.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig3a_summer.yaml @@ -25,13 +25,13 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 37 targets: - data_source: local + loader_name: local path: ./data/CORDEX-Africa_data/AFRICA*pr.nc variable: pr http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/CORDEX-Africa_examples/Fig3a_winter.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/CORDEX-Africa_examples/Fig3a_winter.yaml b/RCMES/configuration_files/CORDEX-Africa_examples/Fig3a_winter.yaml index 554a85b..00f03eb 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig3a_winter.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig3a_winter.yaml @@ -25,13 +25,13 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 37 targets: - data_source: local + loader_name: local path: ./data/CORDEX-Africa_data/AFRICA*pr.nc variable: pr http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/CORDEX-Africa_examples/Fig3b_summer.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/CORDEX-Africa_examples/Fig3b_summer.yaml b/RCMES/configuration_files/CORDEX-Africa_examples/Fig3b_summer.yaml index 0bf8b0e..88f9a6a 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig3b_summer.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig3b_summer.yaml @@ -25,13 +25,13 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 38 targets: - data_source: local + loader_name: local path: ./data/CORDEX-Africa_data/AFRICA*tas.nc variable: tas http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/CORDEX-Africa_examples/Fig3b_winter.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/CORDEX-Africa_examples/Fig3b_winter.yaml b/RCMES/configuration_files/CORDEX-Africa_examples/Fig3b_winter.yaml index 21b484d..1633b8f 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig3b_winter.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig3b_winter.yaml @@ -25,13 +25,13 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 38 targets: - data_source: local + loader_name: local path: ./data/CORDEX-Africa_data/AFRICA*tas.nc variable: tas http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/CORDEX-Africa_examples/Fig4d_7d_8ad.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/CORDEX-Africa_examples/Fig4d_7d_8ad.yaml b/RCMES/configuration_files/CORDEX-Africa_examples/Fig4d_7d_8ad.yaml index 3303424..cc6371e 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig4d_7d_8ad.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig4d_7d_8ad.yaml @@ -25,13 +25,13 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 38 targets: - data_source: local + loader_name: local path: ./data/CORDEX-Africa_data/AFRICA*tas.nc variable: tas http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/CORDEX-Africa_examples/Fig4f_9bcd.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/CORDEX-Africa_examples/Fig4f_9bcd.yaml b/RCMES/configuration_files/CORDEX-Africa_examples/Fig4f_9bcd.yaml index aa1ca3d..feaec94 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig4f_9bcd.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig4f_9bcd.yaml @@ -25,14 +25,14 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 42 multiplying_factor: 0.01 targets: - data_source: local + loader_name: local path: ./data/CORDEX-Africa_data/AFRICA*clt.nc variable: clt latitude_name: lat http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/CORDEX-Africa_examples/Fig7e_8be.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/CORDEX-Africa_examples/Fig7e_8be.yaml b/RCMES/configuration_files/CORDEX-Africa_examples/Fig7e_8be.yaml index 94d3366..5caf4da 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig7e_8be.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig7e_8be.yaml @@ -25,13 +25,13 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 39 targets: - data_source: local + loader_name: local path: ./data/CORDEX-Africa_data/AFRICA*tasmax.nc variable: tasmax http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/CORDEX-Africa_examples/Fig7f_8cf.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/CORDEX-Africa_examples/Fig7f_8cf.yaml b/RCMES/configuration_files/CORDEX-Africa_examples/Fig7f_8cf.yaml index 1825ca9..1f2c5f0 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig7f_8cf.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig7f_8cf.yaml @@ -25,13 +25,13 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 41 targets: - data_source: local + loader_name: local path: ./data/CORDEX-Africa_data/AFRICA*tasmin.nc variable: tasmin latitude_name: lat http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_cloud_fraction_bias_to_SRB.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_cloud_fraction_bias_to_SRB.yaml b/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_cloud_fraction_bias_to_SRB.yaml index 001f57c..6dcb3f7 100644 --- a/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_cloud_fraction_bias_to_SRB.yaml +++ b/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_cloud_fraction_bias_to_SRB.yaml @@ -41,14 +41,14 @@ regrid: datasets: reference: - data_source: local + loader_name: local data_name: SRB path: ./data/CORDEX-Arctic_data/srb_rel3.0_shortwave_from_1983_to_2007.nc variable: cld_frac multiplying_factor: 100.0 targets: - data_source: local + loader_name: local path: ./data/CORDEX-Arctic_data/clt*.nc variable: clt http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_rlds_bias_to_SRB.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_rlds_bias_to_SRB.yaml b/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_rlds_bias_to_SRB.yaml index c250d6a..25919da 100644 --- a/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_rlds_bias_to_SRB.yaml +++ b/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_rlds_bias_to_SRB.yaml @@ -41,14 +41,14 @@ regrid: datasets: reference: - data_source: local + loader_name: local data_name: SRB path: ./data/CORDEX-Arctic_data/srb_rel3.0_longwave_from_1983_to_2007.nc variable: lw_sfc_dn multiplying_factor: 1 targets: - data_source: local + loader_name: local path: ./data/CORDEX-Arctic_data/rlds*.nc variable: rlds http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_rlus_bias_to_SRB.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_rlus_bias_to_SRB.yaml b/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_rlus_bias_to_SRB.yaml index 7e81e76..decb9f0 100644 --- a/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_rlus_bias_to_SRB.yaml +++ b/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_rlus_bias_to_SRB.yaml @@ -41,14 +41,14 @@ regrid: datasets: reference: - data_source: local + loader_name: local data_name: SRB path: ./data/CORDEX-Arctic_data/srb_rel3.0_longwave_from_1983_to_2007.nc variable: lw_sfc_up multiplying_factor: 1 targets: - data_source: local + loader_name: local path: ./data/CORDEX-Arctic_data/rlus*.nc variable: rlus http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_rsds_bias_to_SRB.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_rsds_bias_to_SRB.yaml b/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_rsds_bias_to_SRB.yaml index e9c3346..050c385 100644 --- a/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_rsds_bias_to_SRB.yaml +++ b/RCMES/configuration_files/CORDEX-Arctic_examples/cordex-arctic_rsds_bias_to_SRB.yaml @@ -41,14 +41,14 @@ regrid: datasets: reference: - data_source: local + loader_name: local data_name: SRB path: ./data/CORDEX-Arctic_data/srb_rel3.0_shortwave_from_1983_to_2007.nc variable: sw_sfc_dn multiplying_factor: 1 targets: - data_source: local + loader_name: local path: ./data/CORDEX-Arctic_data/rsds*.nc variable: rsds http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/ESGF_example/ESGF-Example.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/ESGF_example/ESGF-Example.yaml b/RCMES/configuration_files/ESGF_example/ESGF-Example.yaml index 03edcf5..1e56b83 100644 --- a/RCMES/configuration_files/ESGF_example/ESGF-Example.yaml +++ b/RCMES/configuration_files/ESGF_example/ESGF-Example.yaml @@ -39,13 +39,13 @@ regrid: datasets: reference: - data_source: ESGF + loader_name: ESGF data_name: AVISO dataset_id: obs4MIPs.CNES.AVISO.zos.mon.v20110829|esgf-data.jpl.nasa.gov variable: zos targets: - data_source: ESGF + loader_name: ESGF data_name: MPI-ESM dataset_id: cmip5.output1.MPI-M.MPI-ESM-LR.decadal1994.mon.ocean.Omon.r1i1p1.v20120529|esgf1.dkrz.de variable: zos http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/ESGF_example/ESGF-Example_local.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/ESGF_example/ESGF-Example_local.yaml b/RCMES/configuration_files/ESGF_example/ESGF-Example_local.yaml index 4be62ec..bd66825 100644 --- a/RCMES/configuration_files/ESGF_example/ESGF-Example_local.yaml +++ b/RCMES/configuration_files/ESGF_example/ESGF-Example_local.yaml @@ -39,13 +39,13 @@ regrid: datasets: reference: - data_source: local + loader_name: local data_name: AVISO path: ./data/ESGF_data/zos_AVISO_L4_199210-201012.nc variable: zos targets: - data_source: local + loader_name: local path: ./data/ESGF_data/zos_Omon_MPI-ESM-LR_decadal1994_r1i1p1_199501-200412.nc variable: zos GCM_data: True http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/NARCCAP_examples/Fig10_and_Fig11.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/NARCCAP_examples/Fig10_and_Fig11.yaml b/RCMES/configuration_files/NARCCAP_examples/Fig10_and_Fig11.yaml index a23323d..c5f9e70 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig10_and_Fig11.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig10_and_Fig11.yaml @@ -24,13 +24,13 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 37 targets: - data_source: local + loader_name: local path: ./data/NARCCAP_data/prec*ncep.monavg.nc variable: prec http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/NARCCAP_examples/Fig12_summer.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/NARCCAP_examples/Fig12_summer.yaml b/RCMES/configuration_files/NARCCAP_examples/Fig12_summer.yaml index 0def926..9af97f6 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig12_summer.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig12_summer.yaml @@ -24,13 +24,13 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 37 targets: - data_source: local + loader_name: local path: ./data/NARCCAP_data/prec*ncep.monavg.nc variable: prec http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/NARCCAP_examples/Fig12_winter.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/NARCCAP_examples/Fig12_winter.yaml b/RCMES/configuration_files/NARCCAP_examples/Fig12_winter.yaml index 79bfe15..6f829bd 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig12_winter.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig12_winter.yaml @@ -24,13 +24,13 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 37 targets: - data_source: local + loader_name: local path: ./data/NARCCAP_data/prec*ncep.monavg.nc variable: prec http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/NARCCAP_examples/Fig14_and_Fig15.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/NARCCAP_examples/Fig14_and_Fig15.yaml b/RCMES/configuration_files/NARCCAP_examples/Fig14_and_Fig15.yaml index 12e7283..f012ed9 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig14_and_Fig15.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig14_and_Fig15.yaml @@ -24,14 +24,14 @@ regrid: datasets: reference: - data_source: local + loader_name: local data_name: SRB path: ./data/NARCCAP_data/srb_rel3.0_shortwave_from_1983_to_2007.nc variable: sw_sfc_dn targets: - data_source: local + loader_name: local path: ./data/NARCCAP_data/rsds*ncep.monavg.nc variable: rsds http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/NARCCAP_examples/Fig16_summer.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/NARCCAP_examples/Fig16_summer.yaml b/RCMES/configuration_files/NARCCAP_examples/Fig16_summer.yaml index c19ce93..eee5f2c 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig16_summer.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig16_summer.yaml @@ -24,13 +24,13 @@ regrid: datasets: reference: - data_source: local + loader_name: local data_name: SRB path: ./data/NARCCAP_data/srb_rel3.0_shortwave_from_1983_to_2007.nc variable: sw_sfc_dn targets: - data_source: local + loader_name: local path: ./data/NARCCAP_data/rsds*ncep.monavg.nc variable: rsds http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/NARCCAP_examples/Fig16_winter.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/NARCCAP_examples/Fig16_winter.yaml b/RCMES/configuration_files/NARCCAP_examples/Fig16_winter.yaml index aad43ce..9a31b21 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig16_winter.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig16_winter.yaml @@ -24,13 +24,13 @@ regrid: datasets: reference: - data_source: local + loader_name: local data_name: SRB path: ./data/NARCCAP_data/srb_rel3.0_shortwave_from_1983_to_2007.nc variable: sw_sfc_dn targets: - data_source: local + loader_name: local path: ./data/NARCCAP_data/rsds*ncep.monavg.nc variable: rsds http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/NARCCAP_examples/Fig5_and_Fig6.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/NARCCAP_examples/Fig5_and_Fig6.yaml b/RCMES/configuration_files/NARCCAP_examples/Fig5_and_Fig6.yaml index 190774c..929b5c9 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig5_and_Fig6.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig5_and_Fig6.yaml @@ -24,13 +24,13 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 38 targets: - data_source: local + loader_name: local path: ./data/NARCCAP_data/temp.*ncep.monavg.nc variable: temp http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/NARCCAP_examples/Fig7_summer.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/NARCCAP_examples/Fig7_summer.yaml b/RCMES/configuration_files/NARCCAP_examples/Fig7_summer.yaml index 9b0bcb9..fb9f8d1 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig7_summer.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig7_summer.yaml @@ -24,13 +24,13 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 38 targets: - data_source: local + loader_name: local path: ./data/NARCCAP_data/temp*ncep.monavg.nc variable: temp http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/NARCCAP_examples/Fig7_winter.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/NARCCAP_examples/Fig7_winter.yaml b/RCMES/configuration_files/NARCCAP_examples/Fig7_winter.yaml index dc67d5d..3416167 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig7_winter.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig7_winter.yaml @@ -24,13 +24,13 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 38 targets: - data_source: local + loader_name: local path: ./data/NARCCAP_data/temp*ncep.monavg.nc variable: temp http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/NARCCAP_examples/Fig8_and_Fig9.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/NARCCAP_examples/Fig8_and_Fig9.yaml b/RCMES/configuration_files/NARCCAP_examples/Fig8_and_Fig9.yaml index 1eb19d4..bf4ca80 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig8_and_Fig9.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig8_and_Fig9.yaml @@ -24,13 +24,13 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 37 targets: - data_source: local + loader_name: local path: ./data/NARCCAP_data/prec.*ncep.monavg.nc variable: prec http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_prmo-eus_rcmed.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_prmo-eus_rcmed.yaml b/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_prmo-eus_rcmed.yaml index 5c73c3e..8f27517 100644 --- a/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_prmo-eus_rcmed.yaml +++ b/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_prmo-eus_rcmed.yaml @@ -24,14 +24,14 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: TRMM dataset_id: 3 parameter_id: 36 variable: pr targets: - data_source: local + loader_name: local path: ./data/dscale/prmo*.nc variable: pr http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_prmo-wus_local.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_prmo-wus_local.yaml b/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_prmo-wus_local.yaml index d9bde7a..2f6948c 100644 --- a/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_prmo-wus_local.yaml +++ b/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_prmo-wus_local.yaml @@ -24,13 +24,13 @@ regrid: datasets: reference: - data_source: local + loader_name: local data_name: NLDAS path: ./data/dscale/obs/prmo_lds-lds_1999-2010.nc variable: pr targets: - data_source: local + loader_name: local path: ./data/dscale/prmo*.nc variable: pr http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_prmo-wus_rcmed.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_prmo-wus_rcmed.yaml b/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_prmo-wus_rcmed.yaml index 073deee..fb26f7c 100644 --- a/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_prmo-wus_rcmed.yaml +++ b/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_prmo-wus_rcmed.yaml @@ -24,14 +24,14 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: TRMM dataset_id: 3 parameter_id: 36 variable: pr targets: - data_source: local + loader_name: local path: ./data/dscale/prmo*.nc variable: pr http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_wus_prec_trmm_vs_nldas.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_wus_prec_trmm_vs_nldas.yaml b/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_wus_prec_trmm_vs_nldas.yaml index 725998c..d3474fd 100644 --- a/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_wus_prec_trmm_vs_nldas.yaml +++ b/RCMES/configuration_files/NASA_downscaling_project_Part1/dscale_wus_prec_trmm_vs_nldas.yaml @@ -24,14 +24,14 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: TRMM dataset_id: 3 parameter_id: 36 variable: pr targets: - data_source: local + loader_name: local path: ./data/dscale/obs/prmo*.nc variable: pr http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/configuration_files/cordex_AF_prec_subregion_annual_cycle_time_series.yaml ---------------------------------------------------------------------- diff --git a/RCMES/configuration_files/cordex_AF_prec_subregion_annual_cycle_time_series.yaml b/RCMES/configuration_files/cordex_AF_prec_subregion_annual_cycle_time_series.yaml index bebe810..2ef6d5e 100644 --- a/RCMES/configuration_files/cordex_AF_prec_subregion_annual_cycle_time_series.yaml +++ b/RCMES/configuration_files/cordex_AF_prec_subregion_annual_cycle_time_series.yaml @@ -24,13 +24,13 @@ regrid: datasets: reference: - data_source: rcmed + loader_name: rcmed data_name: CRU dataset_id: 10 parameter_id: 37 targets: - data_source: local + loader_name: local path: ./data/config_training/AFRICA*pr.nc variable: pr http://git-wip-us.apache.org/repos/asf/climate/blob/711f86ba/RCMES/run_RCMES.py ---------------------------------------------------------------------- diff --git a/RCMES/run_RCMES.py b/RCMES/run_RCMES.py index cd69bc4..93fd2b5 100644 --- a/RCMES/run_RCMES.py +++ b/RCMES/run_RCMES.py @@ -16,13 +16,10 @@ # under the License. #Apache OCW lib immports -import ocw.dataset_processor as dsp -import ocw.data_source.local as local -import ocw.data_source.rcmed as rcmed -import ocw.data_source.esgf as esgf import ocw.plotter as plotter import ocw.utils as utils from ocw.dataset import Bounds +from ocw.dataset_loader import DatasetLoader import matplotlib.pyplot as plt from matplotlib import rcParams @@ -39,7 +36,7 @@ from getpass import getpass from metrics_and_plots import * -import ssl +import ssl if hasattr(ssl, '_create_unverified_context'): ssl._create_default_https_context = ssl._create_unverified_context @@ -60,42 +57,42 @@ max_lat = space_info['max_lat'] min_lon = space_info['min_lon'] max_lon = space_info['max_lon'] -ref_data_info = config['datasets']['reference'] +obs_data_info = config['datasets']['reference'] model_data_info = config['datasets']['targets'] -if ref_data_info['data_source'] == 'ESGF' or model_data_info['data_source'] == 'ESGF': +if obs_data_info['loader_name'] == 'ESGF' or model_data_info['loader_name'] == 'ESGF': username=raw_input('Enter your ESGF OpenID:\n') password=getpass(prompt='Enter your ESGF password:\n') """ Step 1: Load the reference data """ -ref_lat_name = None -ref_lon_name = None -if 'latitude_name' in ref_data_info.keys(): - ref_lat_name = ref_data_info['latitude_name'] -if 'longitude_name' in ref_data_info.keys(): - ref_lon_name = ref_data_info['longitude_name'] -print 'Loading observation dataset:\n',ref_data_info -ref_name = ref_data_info['data_name'] -if ref_data_info['data_source'] == 'local': - ref_dataset = local.load_file(ref_data_info['path'], - ref_data_info['variable'], name=ref_name, - lat_name=ref_lat_name, lon_name=ref_lon_name) -elif ref_data_info['data_source'] == 'rcmed': - ref_dataset = rcmed.parameter_dataset(ref_data_info['dataset_id'], - ref_data_info['parameter_id'], +obs_lat_name = None +obs_lon_name = None +if 'lat_name' in obs_data_info.keys(): + obs_lat_name = obs_data_info['lat_name'] +if 'lon_name' in obs_data_info.keys(): + obs_lon_name = obs_data_info['long_name'] +print 'Loading observation dataset:\n',obs_data_info +obs_name = obs_data_info['data_name'] +if obs_data_info['loader_name'] == 'local': + obs_dataset = local.load_file(obs_data_info['path'], + obs_data_info['variable'], name=obs_name, + lat_name=obs_lat_name, lon_name=obs_lon_name) +elif obs_data_info['loader_name'] == 'rcmed': + obs_dataset = rcmed.parameter_dataset(obs_data_info['dataset_id'], + obs_data_info['parameter_id'], min_lat, max_lat, min_lon, max_lon, start_time, end_time) -elif ref_data_info['data_source'] == 'ESGF': - ds = esgf.load_dataset(dataset_id = ref_data_info['dataset_id'], - variable = ref_data_info['variable'], +elif obs_data_info['loader_name'] == 'ESGF': + ds = esgf.load_dataset(dataset_id = obs_data_info['dataset_id'], + variable = obs_data_info['variable'], esgf_username=username, esgf_password=password) - ref_dataset = ds[0] + obs_dataset = ds[0] else: print ' ' if temporal_resolution == 'daily' or temporal_resolution == 'monthly': - ref_dataset = dsp.normalize_dataset_datetimes(ref_dataset, temporal_resolution) -if 'multiplying_factor' in ref_data_info.keys(): - ref_dataset.values = ref_dataset.values*ref_data_info['multiplying_factor'] + obs_dataset = dsp.normalize_dataset_datetimes(obs_dataset, temporal_resolution) +if 'multiplying_factor' in obs_data_info.keys(): + obs_dataset.values = obs_dataset.values*obs_data_info['multiplying_factor'] """ Step 2: Load model NetCDF Files into OCW Dataset Objects """ model_lat_name = None @@ -107,13 +104,13 @@ if 'longitude_name' in model_data_info.keys(): boundary_check_model = True if 'GCM_data' in model_data_info.keys(): if model_data_info['GCM_data']: - boundary_check_model = False + boundary_check_model = False print 'Loading model datasets:\n',model_data_info -if model_data_info['data_source'] == 'local': +if model_data_info['loader_name'] == 'local': model_datasets, model_names = local.load_multiple_files(file_path = model_data_info['path'], - variable_name =model_data_info['variable'], + variable_name =model_data_info['variable'], lat_name=model_lat_name, lon_name=model_lon_name) -elif model_data_info['data_source'] == 'ESGF': +elif model_data_info['loader_name'] == 'ESGF': md = esgf.load_dataset(dataset_id=model_data_info['dataset_id'], variable=model_data_info['variable'], esgf_username=username, @@ -132,23 +129,23 @@ if temporal_resolution == 'daily' or temporal_resolution == 'monthly': """ Step 3: Subset the data for temporal and spatial domain """ # Create a Bounds object to use for subsetting if time_info['maximum_overlap_period']: - start_time, end_time = utils.get_temporal_overlap([ref_dataset]+model_datasets) + start_time, end_time = utils.get_temporal_overlap([obs_dataset]+model_datasets) print 'Maximum overlap period' print 'start_time:', start_time print 'end_time:', end_time if temporal_resolution == 'monthly' and end_time.day !=1: end_time = end_time.replace(day=1) -if ref_data_info['data_source'] == 'rcmed': - min_lat = np.max([min_lat, ref_dataset.lats.min()]) - max_lat = np.min([max_lat, ref_dataset.lats.max()]) - min_lon = np.max([min_lon, ref_dataset.lons.min()]) - max_lon = np.min([max_lon, ref_dataset.lons.max()]) +if obs_data_info['loader_name'] == 'rcmed': + min_lat = np.max([min_lat, obs_dataset.lats.min()]) + max_lat = np.min([max_lat, obs_dataset.lats.max()]) + min_lon = np.max([min_lon, obs_dataset.lons.min()]) + max_lon = np.min([max_lon, obs_dataset.lons.max()]) bounds = Bounds(min_lat, max_lat, min_lon, max_lon, start_time, end_time) -ref_dataset = dsp.subset(ref_dataset, bounds) -if ref_dataset.temporal_resolution() != temporal_resolution: - ref_dataset = dsp.temporal_rebin(ref_dataset, temporal_resolution) +obs_dataset = dsp.subset(obs_dataset, bounds) +if obs_dataset.temporal_resolution() != temporal_resolution: + obs_dataset = dsp.temporal_rebin(obs_dataset, temporal_resolution) for idata,dataset in enumerate(model_datasets): model_datasets[idata] = dsp.subset(dataset, bounds) if dataset.temporal_resolution() != temporal_resolution: @@ -159,14 +156,14 @@ month_start = time_info['month_start'] month_end = time_info['month_end'] average_each_year = time_info['average_each_year'] -ref_dataset = dsp.temporal_subset(ref_dataset,month_start, month_end,average_each_year) +obs_dataset = dsp.temporal_subset(obs_dataset,month_start, month_end,average_each_year) for idata,dataset in enumerate(model_datasets): model_datasets[idata] = dsp.temporal_subset(dataset,month_start, month_end,average_each_year) # generate grid points for regridding if config['regrid']['regrid_on_reference']: - new_lat = ref_dataset.lats - new_lon = ref_dataset.lons + new_lat = obs_dataset.lats + new_lon = obs_dataset.lons else: delta_lat = config['regrid']['regrid_dlat'] delta_lon = config['regrid']['regrid_dlon'] @@ -178,7 +175,7 @@ else: # number of models nmodel = len(model_datasets) print 'Dataset loading completed' -print 'Observation data:', ref_name +print 'Observation data:', obs_name print 'Number of model datasets:',nmodel for model_name in model_names: print model_name @@ -186,21 +183,21 @@ for model_name in model_names: """ Step 4: Spatial regriding of the reference datasets """ print 'Regridding datasets: ', config['regrid'] if not config['regrid']['regrid_on_reference']: - ref_dataset = dsp.spatial_regrid(ref_dataset, new_lat, new_lon) + obs_dataset = dsp.spatial_regrid(obs_dataset, new_lat, new_lon) print 'Reference dataset has been regridded' for idata,dataset in enumerate(model_datasets): model_datasets[idata] = dsp.spatial_regrid(dataset, new_lat, new_lon, boundary_check = boundary_check_model) print model_names[idata]+' has been regridded' print 'Propagating missing data information' -ref_dataset = dsp.mask_missing_data([ref_dataset]+model_datasets)[0] -model_datasets = dsp.mask_missing_data([ref_dataset]+model_datasets)[1:] +obs_dataset = dsp.mask_missing_data([obs_dataset]+model_datasets)[0] +model_datasets = dsp.mask_missing_data([obs_dataset]+model_datasets)[1:] """ Step 5: Checking and converting variable units """ print 'Checking and converting variable units' -ref_dataset = dsp.variable_unit_conversion(ref_dataset) +obs_dataset = dsp.variable_unit_conversion(obs_dataset) for idata,dataset in enumerate(model_datasets): model_datasets[idata] = dsp.variable_unit_conversion(dataset) - + print 'Generating multi-model ensemble' if len(model_datasets) >= 2.: @@ -217,8 +214,8 @@ if config['use_subregions']: print 'Calculating spatial averages and standard deviations of ',str(nsubregion),' subregions' - ref_subregion_mean, ref_subregion_std, subregion_array = utils.calc_subregion_area_mean_and_std([ref_dataset], subregions) - model_subregion_mean, model_subregion_std, subregion_array = utils.calc_subregion_area_mean_and_std(model_datasets, subregions) + obs_subregion_mean, obs_subregion_std, subregion_array = utils.calc_subregion_area_mean_and_std([obs_dataset], subregions) + model_subregion_mean, model_subregion_std, subregion_array = utils.calc_subregion_area_mean_and_std(model_datasets, subregions) """ Step 7: Write a netCDF file """ workdir = config['workdir'] @@ -229,19 +226,19 @@ if not os.path.exists(workdir): os.system("mkdir -p "+workdir) if config['use_subregions']: - dsp.write_netcdf_multiple_datasets_with_subregions(ref_dataset, ref_name, model_datasets, model_names, + dsp.write_netcdf_multiple_datasets_with_subregions(obs_dataset, obs_name, model_datasets, model_names, path=workdir+config['output_netcdf_filename'], - subregions=subregions, subregion_array = subregion_array, - ref_subregion_mean=ref_subregion_mean, ref_subregion_std=ref_subregion_std, + subregions=subregions, subregion_array = subregion_array, + obs_subregion_mean=obs_subregion_mean, obs_subregion_std=obs_subregion_std, model_subregion_mean=model_subregion_mean, model_subregion_std=model_subregion_std) else: - dsp.write_netcdf_multiple_datasets_with_subregions(ref_dataset, ref_name, model_datasets, model_names, + dsp.write_netcdf_multiple_datasets_with_subregions(obs_dataset, obs_name, model_datasets, model_names, path=workdir+config['output_netcdf_filename']) """ Step 8: Calculate metrics and draw plots """ nmetrics = config['number_of_metrics_and_plots'] if config['use_subregions']: - Map_plot_subregion(subregions, ref_dataset, workdir) + Map_plot_subregion(subregions, obs_dataset, workdir) if nmetrics > 0: print 'Calculating metrics and generating plots' @@ -254,30 +251,28 @@ if nmetrics > 0: if metrics_name == 'Map_plot_bias_of_multiyear_climatology': row, column = plot_info['subplots_array'] if 'map_projection' in plot_info.keys(): - Map_plot_bias_of_multiyear_climatology(ref_dataset, ref_name, model_datasets, model_names, + Map_plot_bias_of_multiyear_climatology(obs_dataset, obs_name, model_datasets, model_names, file_name, row, column, map_projection=plot_info['map_projection']) else: - Map_plot_bias_of_multiyear_climatology(ref_dataset, ref_name, model_datasets, model_names, + Map_plot_bias_of_multiyear_climatology(obs_dataset, obs_name, model_datasets, model_names, file_name, row, column) elif metrics_name == 'Taylor_diagram_spatial_pattern_of_multiyear_climatology': - Taylor_diagram_spatial_pattern_of_multiyear_climatology(ref_dataset, ref_name, model_datasets, model_names, + Taylor_diagram_spatial_pattern_of_multiyear_climatology(obs_dataset, obs_name, model_datasets, model_names, file_name) elif config['use_subregions']: if metrics_name == 'Timeseries_plot_subregion_interannual_variability' and average_each_year: row, column = plot_info['subplots_array'] - Time_series_subregion(ref_subregion_mean, ref_name, model_subregion_mean, model_names, False, + Time_series_subregion(obs_subregion_mean, obs_name, model_subregion_mean, model_names, False, file_name, row, column, x_tick=['Y'+str(i+1) for i in np.arange(model_subregion_mean.shape[1])]) if metrics_name == 'Timeseries_plot_subregion_annual_cycle' and not average_each_year and month_start==1 and month_end==12: row, column = plot_info['subplots_array'] - Time_series_subregion(ref_subregion_mean, ref_name, model_subregion_mean, model_names, True, + Time_series_subregion(obs_subregion_mean, obs_name, model_subregion_mean, model_names, True, file_name, row, column, x_tick=['J','F','M','A','M','J','J','A','S','O','N','D']) if metrics_name == 'Portrait_diagram_subregion_interannual_variability' and average_each_year: - Portrait_diagram_subregion(ref_subregion_mean, ref_name, model_subregion_mean, model_names, False, + Portrait_diagram_subregion(obs_subregion_mean, obs_name, model_subregion_mean, model_names, False, file_name) if metrics_name == 'Portrait_diagram_subregion_annual_cycle' and not average_each_year and month_start==1 and month_end==12: - Portrait_diagram_subregion(ref_subregion_mean, ref_name, model_subregion_mean, model_names, True, + Portrait_diagram_subregion(obs_subregion_mean, obs_name, model_subregion_mean, model_names, True, file_name) else: print 'please check the currently supported metrics' - -
