From 7a477b50d2131d680689a4d255e7b46fdb449edb Mon Sep 17 00:00:00 2001 From: Min-Seop Ahn Date: Sat, 8 Apr 2023 00:04:58 -0700 Subject: [PATCH 1/3] Updated pmpdir and results_dir --- ...iability_across_timescales_PS_3hr_params_CMORPH.py | 11 +++++------ ...riability_across_timescales_PS_3hr_params_IMERG.py | 11 +++++------ ...ariability_across_timescales_PS_3hr_params_TRMM.py | 11 +++++------ ...riability_across_timescales_PS_3hr_params_cmip5.py | 11 +++++------ ...riability_across_timescales_PS_3hr_params_cmip6.py | 11 +++++------ 5 files changed, 25 insertions(+), 30 deletions(-) diff --git a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_CMORPH.py b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_CMORPH.py index 26439c1b6..328d4cf19 100644 --- a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_CMORPH.py +++ b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_CMORPH.py @@ -5,16 +5,15 @@ dat = "CMORPH" var = "pr" frq = "3hr" -ver = "v20221111" +ver = "v20230407" modpath = "/p/user_pub/PCMDIobs/obs4MIPs/NOAA/CMORPH-1-0/3hr/pr/2x2/latest/" mod = "*.nc" -case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) -pmpdir = "/work/ahn6/pr/variability_across_timescales/power_spectrum/" + ver + "_test/" -results_dir = os.path.join( - pmpdir, "%(output_type)", "%(mip)", "%(case_id)" -) +# case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) +case_id = ver +pmpdir = "/p/user_pub/pmp/pmp_results/pmp_v1.1.2" +results_dir = os.path.join(pmpdir, "%(output_type)", "precip", "%(mip)", "%(case_id)", "variability_across_timescales") prd = [2001, 2019] # analysis period fac = 86400 # factor to make unit of [mm/day] diff --git a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_IMERG.py b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_IMERG.py index cefbd573c..c7ec462c0 100644 --- a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_IMERG.py +++ b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_IMERG.py @@ -5,16 +5,15 @@ dat = "IMERG" var = "pr" frq = "3hr" -ver = "v20221111" +ver = "v20230407" modpath = "/p/user_pub/PCMDIobs/obs4MIPs/NASA-GSFC/IMERG-v06B-Final/3hr/pr/2x2/latest/" mod = "*.nc" -case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) -pmpdir = "/work/ahn6/pr/variability_across_timescales/power_spectrum/" + ver + "_test/" -results_dir = os.path.join( - pmpdir, "%(output_type)", "%(mip)", "%(case_id)" -) +# case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) +case_id = ver +pmpdir = "/p/user_pub/pmp/pmp_results/pmp_v1.1.2" +results_dir = os.path.join(pmpdir, "%(output_type)", "precip", "%(mip)", "%(case_id)", "variability_across_timescales") prd = [2001, 2019] # analysis period fac = 86400 # factor to make unit of [mm/day] diff --git a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_TRMM.py b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_TRMM.py index 77dbe90c4..57364dced 100644 --- a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_TRMM.py +++ b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_TRMM.py @@ -5,16 +5,15 @@ dat = "TRMM" var = "pr" frq = "3hr" -ver = "v20221111" +ver = "v20230407" modpath = "/p/user_pub/PCMDIobs/obs4MIPs/NASA-GSFC/TRMM-3B43v-7/3hr/pr/2x2/latest/" mod = "*.nc" -case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) -pmpdir = "/work/ahn6/pr/variability_across_timescales/power_spectrum/" + ver + "_test/" -results_dir = os.path.join( - pmpdir, "%(output_type)", "%(mip)", "%(case_id)" -) +# case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) +case_id = ver +pmpdir = "/p/user_pub/pmp/pmp_results/pmp_v1.1.2" +results_dir = os.path.join(pmpdir, "%(output_type)", "precip", "%(mip)", "%(case_id)", "variability_across_timescales") prd = [2001, 2019] # analysis period fac = 86400 # factor to make unit of [mm/day] diff --git a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_cmip5.py b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_cmip5.py index b06197e62..45843c4ef 100644 --- a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_cmip5.py +++ b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_cmip5.py @@ -5,13 +5,12 @@ exp = "historical" var = "pr" frq = "3hr" -ver = "v20221111" +ver = "v20230407" -case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) -pmpdir = "/work/ahn6/pr/variability_across_timescales/power_spectrum/" + ver + "_test/" -results_dir = os.path.join( - pmpdir, "%(output_type)", "%(mip)", exp, "%(case_id)" -) +# case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) +case_id = ver +pmpdir = "/p/user_pub/pmp/pmp_results/pmp_v1.1.2" +results_dir = os.path.join(pmpdir, "%(output_type)", "precip", "%(mip)", exp, "%(case_id)", "variability_across_timescales") prd = [1985, 2004] # analysis period fac = 86400 # factor to make unit of [mm/day] diff --git a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_cmip6.py b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_cmip6.py index 80fb2e2b0..c199d0705 100644 --- a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_cmip6.py +++ b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_cmip6.py @@ -5,13 +5,12 @@ exp = "historical" var = "pr" frq = "3hr" -ver = "v20221111" +ver = "v20230407" -case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) -pmpdir = "/work/ahn6/pr/variability_across_timescales/power_spectrum/" + ver + "_test/" -results_dir = os.path.join( - pmpdir, "%(output_type)", "%(mip)", exp, "%(case_id)" -) +# case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) +case_id = ver +pmpdir = "/p/user_pub/pmp/pmp_results/pmp_v1.1.2" +results_dir = os.path.join(pmpdir, "%(output_type)", "precip", "%(mip)", exp, "%(case_id)", "variability_across_timescales") prd = [1985, 2004] # analysis period fac = 86400 # factor to make unit of [mm/day] From a129711f93ebc74d54abc2725f01ec0f05469f02 Mon Sep 17 00:00:00 2001 From: Min-Seop Ahn Date: Sat, 8 Apr 2023 00:07:41 -0700 Subject: [PATCH 2/3] Updated pmpdir and results_dir --- ...ariability_across_timescales_PS_day_params_TRMM.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_day_params_TRMM.py b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_day_params_TRMM.py index eaf26f2be..a26145148 100644 --- a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_day_params_TRMM.py +++ b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_day_params_TRMM.py @@ -5,16 +5,15 @@ dat = "TRMM" var = "pr" frq = "day" -ver = "v20221111" +ver = "v20230407" modpath = "/p/user_pub/PCMDIobs/obs4MIPs/NASA-GSFC/TRMM-3B42v-7/day/pr/1x1/latest" mod = "*.nc" -case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) -pmpdir = "/work/ahn6/pr/variability_across_timescales/power_spectrum/" + ver + "_test/" -results_dir = os.path.join( - pmpdir, "%(output_type)", "%(mip)", "%(case_id)" -) +# case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) +case_id = ver +pmpdir = "/p/user_pub/pmp/pmp_results/pmp_v1.1.2" +results_dir = os.path.join(pmpdir, "%(output_type)", "precip", "%(mip)", "%(case_id)", "variability_across_timescales") prd = [2001, 2019] # analysis period fac = 86400 # factor to make unit of [mm/day] From 2fd6473f2bf36e31aeedd27954f31a96a9488d0e Mon Sep 17 00:00:00 2001 From: Min-Seop Ahn Date: Fri, 28 Apr 2023 15:25:45 -0700 Subject: [PATCH 3/3] Updated params --- .../variability_across_timescales_PS_3hr_params_CMORPH.py | 4 ++-- .../variability_across_timescales_PS_3hr_params_IMERG.py | 4 ++-- .../param/variability_across_timescales_PS_3hr_params_TRMM.py | 4 ++-- .../variability_across_timescales_PS_3hr_params_cmip5.py | 4 ++-- .../variability_across_timescales_PS_3hr_params_cmip6.py | 4 ++-- .../param/variability_across_timescales_PS_day_params_TRMM.py | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_CMORPH.py b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_CMORPH.py index 328d4cf19..bb9de85af 100644 --- a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_CMORPH.py +++ b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_CMORPH.py @@ -10,8 +10,8 @@ modpath = "/p/user_pub/PCMDIobs/obs4MIPs/NOAA/CMORPH-1-0/3hr/pr/2x2/latest/" mod = "*.nc" -# case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) -case_id = ver +case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) +# case_id = ver pmpdir = "/p/user_pub/pmp/pmp_results/pmp_v1.1.2" results_dir = os.path.join(pmpdir, "%(output_type)", "precip", "%(mip)", "%(case_id)", "variability_across_timescales") diff --git a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_IMERG.py b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_IMERG.py index c7ec462c0..bb78ee192 100644 --- a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_IMERG.py +++ b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_IMERG.py @@ -10,8 +10,8 @@ modpath = "/p/user_pub/PCMDIobs/obs4MIPs/NASA-GSFC/IMERG-v06B-Final/3hr/pr/2x2/latest/" mod = "*.nc" -# case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) -case_id = ver +case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) +# case_id = ver pmpdir = "/p/user_pub/pmp/pmp_results/pmp_v1.1.2" results_dir = os.path.join(pmpdir, "%(output_type)", "precip", "%(mip)", "%(case_id)", "variability_across_timescales") diff --git a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_TRMM.py b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_TRMM.py index 57364dced..2a0bcb469 100644 --- a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_TRMM.py +++ b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_TRMM.py @@ -10,8 +10,8 @@ modpath = "/p/user_pub/PCMDIobs/obs4MIPs/NASA-GSFC/TRMM-3B43v-7/3hr/pr/2x2/latest/" mod = "*.nc" -# case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) -case_id = ver +case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) +# case_id = ver pmpdir = "/p/user_pub/pmp/pmp_results/pmp_v1.1.2" results_dir = os.path.join(pmpdir, "%(output_type)", "precip", "%(mip)", "%(case_id)", "variability_across_timescales") diff --git a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_cmip5.py b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_cmip5.py index 45843c4ef..afb957264 100644 --- a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_cmip5.py +++ b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_cmip5.py @@ -7,8 +7,8 @@ frq = "3hr" ver = "v20230407" -# case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) -case_id = ver +case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) +# case_id = ver pmpdir = "/p/user_pub/pmp/pmp_results/pmp_v1.1.2" results_dir = os.path.join(pmpdir, "%(output_type)", "precip", "%(mip)", exp, "%(case_id)", "variability_across_timescales") diff --git a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_cmip6.py b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_cmip6.py index c199d0705..27c634594 100644 --- a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_cmip6.py +++ b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_3hr_params_cmip6.py @@ -7,8 +7,8 @@ frq = "3hr" ver = "v20230407" -# case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) -case_id = ver +case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) +# case_id = ver pmpdir = "/p/user_pub/pmp/pmp_results/pmp_v1.1.2" results_dir = os.path.join(pmpdir, "%(output_type)", "precip", "%(mip)", exp, "%(case_id)", "variability_across_timescales") diff --git a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_day_params_TRMM.py b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_day_params_TRMM.py index a26145148..17d603ff1 100644 --- a/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_day_params_TRMM.py +++ b/pcmdi_metrics/precip_variability/param/variability_across_timescales_PS_day_params_TRMM.py @@ -10,8 +10,8 @@ modpath = "/p/user_pub/PCMDIobs/obs4MIPs/NASA-GSFC/TRMM-3B42v-7/day/pr/1x1/latest" mod = "*.nc" -# case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) -case_id = ver +case_id = "{:v%Y%m%d}".format(datetime.datetime.now()) +# case_id = ver pmpdir = "/p/user_pub/pmp/pmp_results/pmp_v1.1.2" results_dir = os.path.join(pmpdir, "%(output_type)", "precip", "%(mip)", "%(case_id)", "variability_across_timescales")