fix code styling with pre-commit

PCMDI · Jul 18, 2022 · 5b823f4 · 5b823f4
1 parent 890f34d
commit 5b823f4
Show file tree

Hide file tree

Showing 8 changed files with 154 additions and 153 deletions.
diff --git a/pcmdi_metrics/precip_distribution/README.md b/pcmdi_metrics/precip_distribution/README.md
@@ -20,4 +20,4 @@ Reference: Ahn, M.-S., P. A. Ullrich, P. J. Gleckler, J. Lee,  A. C. Ordonez, A.
 - `scripts_pcmdi/`
   - `run_obs.bash`
   - `run_parallel.wait.bash`
-  
+
diff --git a/pcmdi_metrics/precip_distribution/lib/__init__.py b/pcmdi_metrics/precip_distribution/lib/__init__.py
@@ -1,12 +1,12 @@
 from .argparse_functions import AddParserArgument  # noqa
 from .lib_precip_distribution import (  # noqa
-    precip_distribution_frq_amt, 
-    precip_distribution_cum, 
-    Regrid, 
-    getDailyCalendarMonth, 
-    CalcBinStructure, 
-    MakeDists, 
-    CalcRainMetrics, 
+    precip_distribution_frq_amt,
+    precip_distribution_cum,
+    Regrid,
+    getDailyCalendarMonth,
+    CalcBinStructure,
+    MakeDists,
+    CalcRainMetrics,
     CalcMetricsDomain,
     CalcMetricsDomain3Clust,
     CalcMetricsDomainAR6,

diff --git a/pcmdi_metrics/precip_distribution/lib/lib_precip_distribution.py b/pcmdi_metrics/precip_distribution/lib/lib_precip_distribution.py
diff --git a/pcmdi_metrics/precip_distribution/param/precip_distribution_params_IMERG.py b/pcmdi_metrics/precip_distribution/param/precip_distribution_params_IMERG.py
@@ -5,7 +5,8 @@
 dat = "IMERG"
 var = "pr"
 frq = "day"
-ver = "v20220709"
+ver = "v20220702"
+# ver = "v20220709"
 
 # prd = [2001, 2019]  # analysis period
 prd = [2001, 2020]  # analysis period
@@ -40,5 +41,5 @@
 
 
 ref = "IMERG" # For Perkins socre, P10, and P90
-ref_dir = os.path.join(   
+ref_dir = os.path.join(
     pmpdir, '%(output_type)', "obs", '%(case_id)')
diff --git a/pcmdi_metrics/precip_distribution/precip_distribution_driver.py b/pcmdi_metrics/precip_distribution/precip_distribution_driver.py
@@ -53,8 +53,8 @@
         except FileExistsError:
             pass
     print(outdir(output_type=output_type))
-    
-# Create input file list 
+
+# Create input file list
 file_list = sorted(glob.glob(os.path.join(modpath, "*" + mod + "*")))
 data = []
 for file in file_list:
@@ -89,10 +89,10 @@
         else:
             drg = MV.concatenate((drg, rgtmp))
         print(iyr, drg.shape)
-    
-    # Calculate metrics from precipitation frequency and amount distributions    
+
+    # Calculate metrics from precipitation frequency and amount distributions
     precip_distribution_frq_amt(dat, drg, syr, eyr, res, outdir, ref, refdir, cmec)
-    
+
     # Calculate metrics from precipitation cumulative distributions
     precip_distribution_cum(dat, drg, cal, syr, eyr, res, outdir, cmec)
 
diff --git a/pcmdi_metrics/precip_distribution/scripts_pcmdi/parallel_driver_cmip5.py b/pcmdi_metrics/precip_distribution/scripts_pcmdi/parallel_driver_cmip5.py
@@ -17,7 +17,7 @@
     log_list.append('log_'+file+'_'+str(round(360/res[0]))+'x'+str(round(180/res[1])))
     print(cmd_list[ifl])
 print('Number of data: '+str(len(cmd_list)))
-    
+
 parallel_submitter(
     cmd_list,
     log_dir='./log',

diff --git a/pcmdi_metrics/precip_distribution/scripts_pcmdi/parallel_driver_cmip6.py b/pcmdi_metrics/precip_distribution/scripts_pcmdi/parallel_driver_cmip6.py
@@ -17,7 +17,7 @@
     log_list.append('log_'+file+'_'+str(round(360/res[0]))+'x'+str(round(180/res[1])))
     print(cmd_list[ifl])
 print('Number of data: '+str(len(cmd_list)))
-    
+
 parallel_submitter(
     cmd_list,
     log_dir='./log',

diff --git a/pcmdi_metrics/precip_distribution/scripts_pcmdi/run_parallel.wait.bash b/pcmdi_metrics/precip_distribution/scripts_pcmdi/run_parallel.wait.bash
@@ -1,4 +1,4 @@
 mkdir ./log
 nohup python -u parallel_driver_cmip5.py  > ./log/log_parallel.wait_cmip5 &
-wait
-nohup python -u parallel_driver_cmip6.py  > ./log/log_parallel.wait_cmip6 &
+#wait
+#nohup python -u parallel_driver_cmip6.py  > ./log/log_parallel.wait_cmip6 &