Fixed bugs in run_RCMES.py via testing config files
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/93971e16 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/93971e16 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/93971e16 Branch: refs/heads/master Commit: 93971e16fcfd9823603a436fe6c7f24cc8ee72e1 Parents: 8553dfe Author: Alex Goodman <[email protected]> Authored: Mon Aug 8 17:58:42 2016 -0700 Committer: Alex Goodman <[email protected]> Committed: Mon Aug 8 17:58:42 2016 -0700 ---------------------------------------------------------------------- .../CORDEX-Africa_examples/Fig10a_cru.yaml | 4 +-- .../CORDEX-Africa_examples/Fig10b_cru.yaml | 4 +-- .../CORDEX-Africa_examples/Fig1_2_4a_5.yaml | 4 +-- .../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 | 8 ++--- .../cordex-arctic_rlds_bias_to_SRB.yaml | 8 ++--- .../cordex-arctic_rlus_bias_to_SRB.yaml | 8 ++--- .../cordex-arctic_rsds_bias_to_SRB.yaml | 8 ++--- .../ESGF_example/ESGF-Example.yaml | 4 +-- .../ESGF_example/ESGF-Example_local.yaml | 8 ++--- .../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 | 8 ++--- .../NARCCAP_examples/Fig16_summer.yaml | 8 ++--- .../NARCCAP_examples/Fig16_winter.yaml | 8 ++--- .../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 | 6 ++-- .../dscale_prmo-wus_local.yaml | 8 ++--- .../dscale_prmo-wus_rcmed.yaml | 6 ++-- .../dscale_wus_prec_trmm_vs_nldas.yaml | 6 ++-- ...prec_subregion_annual_cycle_time_series.yaml | 4 +-- RCMES/run_RCMES.py | 31 ++++++++++++-------- 33 files changed, 103 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 76dbf5a..5064700 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig10a_cru.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig10a_cru.yaml @@ -33,8 +33,8 @@ datasets: targets: - loader_name: local - path: ./data/CORDEX-Africa_data/AFRICA*clt.nc - variable: clt + file_path: ./data/CORDEX-Africa_data/AFRICA*clt.nc + variable_name: clt lat_name: lat lon_name: lon http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 013b943..e5fea31 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig10b_cru.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig10b_cru.yaml @@ -32,8 +32,8 @@ datasets: targets: - loader_name: local - path: ./data/CORDEX-Africa_data/AFRICA*pr.nc - variable: pr + file_path: ./data/CORDEX-Africa_data/AFRICA*pr.nc + variable_name: pr number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 231555d..51fb8e9 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 @@ -32,8 +32,8 @@ datasets: targets: - loader_name: local - path: ./data/CORDEX-Africa_data/AFRICA*pr.nc - variable: pr + file_path: ./data/CORDEX-Africa_data/AFRICA*pr.nc + variable_name: pr number_of_metrics_and_plots: 4 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 8ad99ce..4673f33 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig3a_summer.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig3a_summer.yaml @@ -32,8 +32,8 @@ datasets: targets: - loader_name: local - path: ./data/CORDEX-Africa_data/AFRICA*pr.nc - variable: pr + file_path: ./data/CORDEX-Africa_data/AFRICA*pr.nc + variable_name: pr number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 b147118..2af6a87 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig3a_winter.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig3a_winter.yaml @@ -32,8 +32,8 @@ datasets: targets: - loader_name: local - path: ./data/CORDEX-Africa_data/AFRICA*pr.nc - variable: pr + file_path: ./data/CORDEX-Africa_data/AFRICA*pr.nc + variable_name: pr number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 9545a7f..785c667 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig3b_summer.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig3b_summer.yaml @@ -32,8 +32,8 @@ datasets: targets: - loader_name: local - path: ./data/CORDEX-Africa_data/AFRICA*tas.nc - variable: tas + file_path: ./data/CORDEX-Africa_data/AFRICA*tas.nc + variable_name: tas number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 893e007..cba07fb 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig3b_winter.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig3b_winter.yaml @@ -32,8 +32,8 @@ datasets: targets: - loader_name: local - path: ./data/CORDEX-Africa_data/AFRICA*tas.nc - variable: tas + file_path: ./data/CORDEX-Africa_data/AFRICA*tas.nc + variable_name: tas number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 5beaf88..de45204 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig4d_7d_8ad.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig4d_7d_8ad.yaml @@ -32,8 +32,8 @@ datasets: targets: - loader_name: local - path: ./data/CORDEX-Africa_data/AFRICA*tas.nc - variable: tas + file_path: ./data/CORDEX-Africa_data/AFRICA*tas.nc + variable_name: tas number_of_metrics_and_plots: 3 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 7d7d438..b4334c0 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig4f_9bcd.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig4f_9bcd.yaml @@ -33,8 +33,8 @@ datasets: targets: - loader_name: local - path: ./data/CORDEX-Africa_data/AFRICA*clt.nc - variable: clt + file_path: ./data/CORDEX-Africa_data/AFRICA*clt.nc + variable_name: clt lat_name: lat lon_name: lon http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 dd93409..a3bc204 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig7e_8be.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig7e_8be.yaml @@ -32,8 +32,8 @@ datasets: targets: - loader_name: local - path: ./data/CORDEX-Africa_data/AFRICA*tasmax.nc - variable: tasmax + file_path: ./data/CORDEX-Africa_data/AFRICA*tasmax.nc + variable_name: tasmax number_of_metrics_and_plots: 2 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 ace3a73..869de86 100644 --- a/RCMES/configuration_files/CORDEX-Africa_examples/Fig7f_8cf.yaml +++ b/RCMES/configuration_files/CORDEX-Africa_examples/Fig7f_8cf.yaml @@ -32,8 +32,8 @@ datasets: targets: - loader_name: local - path: ./data/CORDEX-Africa_data/AFRICA*tasmin.nc - variable: tasmin + file_path: ./data/CORDEX-Africa_data/AFRICA*tasmin.nc + variable_name: tasmin lat_name: lat lon_name: lon http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 64cda36..3549d2b 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 @@ -43,14 +43,14 @@ datasets: reference: - loader_name: local name: SRB - path: ./data/CORDEX-Arctic_data/srb_rel3.0_shortwave_from_1983_to_2007.nc - variable: cld_frac + file_path: ./data/CORDEX-Arctic_data/srb_rel3.0_shortwave_from_1983_to_2007.nc + variable_name: cld_frac multiplying_factor: 100.0 targets: - loader_name: local - path: ./data/CORDEX-Arctic_data/clt*.nc - variable: clt + file_path: ./data/CORDEX-Arctic_data/clt*.nc + variable_name: clt number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 8d7d2ef..534b644 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 @@ -43,14 +43,14 @@ datasets: reference: - loader_name: local name: SRB - path: ./data/CORDEX-Arctic_data/srb_rel3.0_longwave_from_1983_to_2007.nc - variable: lw_sfc_dn + file_path: ./data/CORDEX-Arctic_data/srb_rel3.0_longwave_from_1983_to_2007.nc + variable_name: lw_sfc_dn multiplying_factor: 1 targets: - loader_name: local - path: ./data/CORDEX-Arctic_data/rlds*.nc - variable: rlds + file_path: ./data/CORDEX-Arctic_data/rlds*.nc + variable_name: rlds number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 5cf1a9b..9c4126f 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 @@ -43,14 +43,14 @@ datasets: reference: - loader_name: local name: SRB - path: ./data/CORDEX-Arctic_data/srb_rel3.0_longwave_from_1983_to_2007.nc - variable: lw_sfc_up + file_path: ./data/CORDEX-Arctic_data/srb_rel3.0_longwave_from_1983_to_2007.nc + variable_name: lw_sfc_up multiplying_factor: 1 targets: - loader_name: local - path: ./data/CORDEX-Arctic_data/rlus*.nc - variable: rlus + file_path: ./data/CORDEX-Arctic_data/rlus*.nc + variable_name: rlus number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 bc6cbb0..194894d 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 @@ -43,14 +43,14 @@ datasets: reference: - loader_name: local name: SRB - path: ./data/CORDEX-Arctic_data/srb_rel3.0_shortwave_from_1983_to_2007.nc - variable: sw_sfc_dn + file_path: ./data/CORDEX-Arctic_data/srb_rel3.0_shortwave_from_1983_to_2007.nc + variable_name: sw_sfc_dn multiplying_factor: 1 targets: - loader_name: local - path: ./data/CORDEX-Arctic_data/rsds*.nc - variable: rsds + file_path: ./data/CORDEX-Arctic_data/rsds*.nc + variable_name: rsds number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 175ee5f..eb65a3d 100644 --- a/RCMES/configuration_files/ESGF_example/ESGF-Example.yaml +++ b/RCMES/configuration_files/ESGF_example/ESGF-Example.yaml @@ -42,13 +42,13 @@ datasets: - loader_name: ESGF name: AVISO dataset_id: obs4MIPs.CNES.AVISO.zos.mon.v20110829|esgf-data.jpl.nasa.gov - variable: zos + variable_name: zos targets: - loader_name: ESGF name: MPI-ESM dataset_id: cmip5.output1.MPI-M.MPI-ESM-LR.decadal1994.mon.ocean.Omon.r1i1p1.v20120529|esgf1.dkrz.de - variable: zos + variable_name: zos boundary_check: False number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 76fbd52..ae1a7a6 100644 --- a/RCMES/configuration_files/ESGF_example/ESGF-Example_local.yaml +++ b/RCMES/configuration_files/ESGF_example/ESGF-Example_local.yaml @@ -41,13 +41,13 @@ datasets: reference: - loader_name: local name: AVISO - path: ./data/ESGF_data/zos_AVISO_L4_199210-201012.nc - variable: zos + file_path: ./data/ESGF_data/zos_AVISO_L4_199210-201012.nc + variable_name: zos targets: - loader_name: local - path: ./data/ESGF_data/zos_Omon_MPI-ESM-LR_decadal1994_r1i1p1_199501-200412.nc - variable: zos + file_path: ./data/ESGF_data/zos_Omon_MPI-ESM-LR_decadal1994_r1i1p1_199501-200412.nc + variable_name: zos GCM_data: True number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 082f57f..70fe68a 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig10_and_Fig11.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig10_and_Fig11.yaml @@ -31,8 +31,8 @@ datasets: targets: - loader_name: local - path: ./data/NARCCAP_data/prec*ncep.monavg.nc - variable: prec + file_path: ./data/NARCCAP_data/prec*ncep.monavg.nc + variable_name: prec number_of_metrics_and_plots: 2 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 8efba11..1c4d1a8 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig12_summer.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig12_summer.yaml @@ -31,8 +31,8 @@ datasets: targets: - loader_name: local - path: ./data/NARCCAP_data/prec*ncep.monavg.nc - variable: prec + file_path: ./data/NARCCAP_data/prec*ncep.monavg.nc + variable_name: prec number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 0aba7f6..e4c0082 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig12_winter.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig12_winter.yaml @@ -31,8 +31,8 @@ datasets: targets: - loader_name: local - path: ./data/NARCCAP_data/prec*ncep.monavg.nc - variable: prec + file_path: ./data/NARCCAP_data/prec*ncep.monavg.nc + variable_name: prec number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 8a7dd2c..a514d6d 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig14_and_Fig15.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig14_and_Fig15.yaml @@ -26,13 +26,13 @@ datasets: reference: - loader_name: local name: SRB - path: ./data/NARCCAP_data/srb_rel3.0_shortwave_from_1983_to_2007.nc - variable: sw_sfc_dn + file_path: ./data/NARCCAP_data/srb_rel3.0_shortwave_from_1983_to_2007.nc + variable_name: sw_sfc_dn targets: - loader_name: local - path: ./data/NARCCAP_data/rsds*ncep.monavg.nc - variable: rsds + file_path: ./data/NARCCAP_data/rsds*ncep.monavg.nc + variable_name: rsds number_of_metrics_and_plots: 2 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 76ed2cc..15002b9 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig16_summer.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig16_summer.yaml @@ -26,13 +26,13 @@ datasets: reference: - loader_name: local name: SRB - path: ./data/NARCCAP_data/srb_rel3.0_shortwave_from_1983_to_2007.nc - variable: sw_sfc_dn + file_path: ./data/NARCCAP_data/srb_rel3.0_shortwave_from_1983_to_2007.nc + variable_name: sw_sfc_dn targets: - loader_name: local - path: ./data/NARCCAP_data/rsds*ncep.monavg.nc - variable: rsds + file_path: ./data/NARCCAP_data/rsds*ncep.monavg.nc + variable_name: rsds number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 aacf827..2226b9f 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig16_winter.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig16_winter.yaml @@ -26,13 +26,13 @@ datasets: reference: - loader_name: local name: SRB - path: ./data/NARCCAP_data/srb_rel3.0_shortwave_from_1983_to_2007.nc - variable: sw_sfc_dn + file_path: ./data/NARCCAP_data/srb_rel3.0_shortwave_from_1983_to_2007.nc + variable_name: sw_sfc_dn targets: - loader_name: local - path: ./data/NARCCAP_data/rsds*ncep.monavg.nc - variable: rsds + file_path: ./data/NARCCAP_data/rsds*ncep.monavg.nc + variable_name: rsds number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 5413f51..21e444f 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig5_and_Fig6.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig5_and_Fig6.yaml @@ -31,8 +31,8 @@ datasets: targets: - loader_name: local - path: ./data/NARCCAP_data/temp.*ncep.monavg.nc - variable: temp + file_path: ./data/NARCCAP_data/temp.*ncep.monavg.nc + variable_name: temp number_of_metrics_and_plots: 2 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 ef7552c..34c9e7e 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig7_summer.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig7_summer.yaml @@ -31,8 +31,8 @@ datasets: targets: - loader_name: local - path: ./data/NARCCAP_data/temp*ncep.monavg.nc - variable: temp + file_path: ./data/NARCCAP_data/temp*ncep.monavg.nc + variable_name: temp number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 9f71482..dfd65c6 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig7_winter.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig7_winter.yaml @@ -31,8 +31,8 @@ datasets: targets: - loader_name: local - path: ./data/NARCCAP_data/temp*ncep.monavg.nc - variable: temp + file_path: ./data/NARCCAP_data/temp*ncep.monavg.nc + variable_name: temp number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 16b456e..3be08fb 100644 --- a/RCMES/configuration_files/NARCCAP_examples/Fig8_and_Fig9.yaml +++ b/RCMES/configuration_files/NARCCAP_examples/Fig8_and_Fig9.yaml @@ -31,8 +31,8 @@ datasets: targets: - loader_name: local - path: ./data/NARCCAP_data/prec.*ncep.monavg.nc - variable: prec + file_path: ./data/NARCCAP_data/prec.*ncep.monavg.nc + variable_name: prec number_of_metrics_and_plots: 2 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 ffca5f6..5385e8b 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 @@ -28,12 +28,12 @@ datasets: name: TRMM dataset_id: 3 parameter_id: 36 - variable: pr + variable_name: pr targets: - loader_name: local - path: ./data/dscale/prmo*.nc - variable: pr + file_path: ./data/dscale/prmo*.nc + variable_name: pr number_of_metrics_and_plots: 2 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 e1aeda5..a6436c6 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 @@ -26,13 +26,13 @@ datasets: reference: - loader_name: local name: NLDAS - path: ./data/dscale/obs/prmo_lds-lds_1999-2010.nc - variable: pr + file_path: ./data/dscale/obs/prmo_lds-lds_1999-2010.nc + variable_name: pr targets: - loader_name: local - path: ./data/dscale/prmo*.nc - variable: pr + file_path: ./data/dscale/prmo*.nc + variable_name: pr number_of_metrics_and_plots: 2 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 919a1f9..d1949e2 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 @@ -28,12 +28,12 @@ datasets: name: TRMM dataset_id: 3 parameter_id: 36 - variable: pr + variable_name: pr targets: - loader_name: local - path: ./data/dscale/prmo*.nc - variable: pr + file_path: ./data/dscale/prmo*.nc + variable_name: pr number_of_metrics_and_plots: 2 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 989254f..5bf5000 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 @@ -28,12 +28,12 @@ datasets: name: TRMM dataset_id: 3 parameter_id: 36 - variable: pr + variable_name: pr targets: - loader_name: local - path: ./data/dscale/obs/prmo*.nc - variable: pr + file_path: ./data/dscale/obs/prmo*.nc + variable_name: pr number_of_metrics_and_plots: 2 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/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 c60e1f9..16357f9 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 @@ -31,8 +31,8 @@ datasets: targets: - loader_name: local - path: ./data/config_training/AFRICA*pr.nc - variable: pr + file_path: ./data/config_training/AFRICA*pr.nc + variable_name: pr number_of_metrics_and_plots: 1 http://git-wip-us.apache.org/repos/asf/climate/blob/93971e16/RCMES/run_RCMES.py ---------------------------------------------------------------------- diff --git a/RCMES/run_RCMES.py b/RCMES/run_RCMES.py index 2816d02..f07f2ef 100644 --- a/RCMES/run_RCMES.py +++ b/RCMES/run_RCMES.py @@ -20,10 +20,12 @@ import sys import ssl import yaml import operator +from datetime import datetime from glob import glob from getpass import getpass import numpy as np import ocw.utils as utils +import ocw.dataset_processor as dsp from ocw.dataset import Bounds from ocw.dataset_loader import DatasetLoader from metrics_and_plots import * @@ -82,16 +84,17 @@ model_data_info = config['datasets']['targets'] # Extract info we don't want to put into the loader config # Multiplying Factor to scale obs by -multiplying_factor = np.ones(nobs) +multiplying_factor = np.ones(len(obs_data_info)) for i, info in enumerate(obs_data_info): if 'multiplying_factor' in info: multiplying_factor[i] = info.pop('multiplying_factor') -# GCM Boundary Check for Regridding -boundary_check = np.ones(nmodels, dtype='bool') +# If models are GCMs we can skip boundary check. Probably need to find a more +# elegant way to express this in the config file API. +boundary_check = True for i, info in enumerate(model_data_info): if 'boundary_check' in info: - boundary_check[i] = info.pop('boundary_check') + boundary_check = info.pop('boundary_check') """ Step 1: Load the observation data """ print 'Loading observation datasets:\n',obs_data_info @@ -99,7 +102,7 @@ obs_datasets = load_datasets_from_config(*obs_data_info, **kwargs) obs_names = [dataset.name for dataset in obs_datasets] for i, dataset in enumerate(obs_datasets): if temporal_resolution == 'daily' or temporal_resolution == 'monthly': - obs_datasets[i] = dsp.normalize_dataset_datetimes(obs_dataset, + obs_datasets[i] = dsp.normalize_dataset_datetimes(dataset, temporal_resolution) if multiplying_factor[i] != 1: @@ -116,7 +119,7 @@ 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([obs_dataset]+model_datasets) + start_time, end_time = utils.get_temporal_overlap(obs_datasets+model_datasets) print 'Maximum overlap period' print 'start_time:', start_time print 'end_time:', end_time @@ -125,10 +128,10 @@ if temporal_resolution == 'monthly' and end_time.day !=1: end_time = end_time.replace(day=1) for i, dataset in enumerate(obs_datasets): - 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()]) + min_lat = np.max([min_lat, dataset.lats.min()]) + max_lat = np.min([max_lat, dataset.lats.max()]) + min_lon = np.max([min_lon, dataset.lons.min()]) + max_lon = np.min([max_lon, dataset.lons.max()]) bounds = Bounds(lat_min=min_lat, lat_max=max_lat, @@ -174,6 +177,8 @@ else: new_lat = np.linspace(min_lat, max_lat, nlat) new_lon = np.linspace(min_lon, max_lon, nlon) +# number of models +nmodel = len(model_datasets) print 'Dataset loading completed' print 'Observation data:', obs_name print 'Number of model datasets:',nmodel @@ -187,7 +192,7 @@ if not config['regrid']['regrid_on_reference']: print 'Reference dataset has been regridded' for i, dataset in enumerate(model_datasets): model_datasets[i] = dsp.spatial_regrid(dataset, new_lat, new_lon, - boundary_check=boundary_check[i]) + boundary_check=boundary_check) print model_names[i]+' has been regridded' print 'Propagating missing data information' obs_dataset = dsp.mask_missing_data([obs_dataset]+model_datasets)[0] @@ -234,8 +239,8 @@ if config['use_subregions']: obs_dataset, obs_name, model_datasets, model_names, path=workdir+config['output_netcdf_filename'], subregions=subregions, subregion_array=subregion_array, - obs_subregion_mean=obs_subregion_mean, - obs_subregion_std=obs_subregion_std, + ref_subregion_mean=obs_subregion_mean, + ref_subregion_std=obs_subregion_std, model_subregion_mean=model_subregion_mean, model_subregion_std=model_subregion_std) else:
