Merge pull request #948 from PCMDI/921_msa_precip_variability_add_TAm…

…etric Precip variability add time-averaging metric
PCMDI · Jun 29, 2023 · 4f041a4 · 4f041a4
2 parents 87d62f9 + 1a1ca06
commit 4f041a4
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 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
@@ -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 = 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
@@ -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 = 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
@@ -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 = 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
@@ -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 = 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
@@ -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 = 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_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 = 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]