Merge pull request #928 from PCMDI/lee1043-patch-1

Simplify codes

pcmdi_metrics/diurnal/scripts/compositeDiurnalStatistics.py

@@ -173,8 +173,7 @@ def compute(params):
  str(args.lastyear),
  )
  LSToutfile = "%s_%s_LocalSolarTimes.nc" % (varbname, dataname)
- if not os.path.exists(args.results_dir):
- os.makedirs(args.results_dir)
+ os.makedirs(args.results_dir, exist_ok=True)
  f = cdms2.open(os.path.join(args.results_dir, avgoutfile), "w")
  g = cdms2.open(os.path.join(args.results_dir, stdoutfile), "w")
  h = cdms2.open(os.path.join(args.results_dir, LSToutfile), "w")

pcmdi_metrics/diurnal/scripts/computeStdOfDailyMeans.py

@@ -106,8 +106,7 @@ def compute(params):
  )
  except Exception as err:
  print("Failed for model: %s with error: %s" % (dataname, err))
- if not os.path.exists(args.results_dir):
- os.makedirs(args.results_dir)
+ os.makedirs(args.results_dir, exist_ok=True)
  g = cdms2.open(os.path.join(args.results_dir, stdoutfile), "w")
  g.write(stdvalues)
  g.close()

pcmdi_metrics/diurnal/scripts/fourierDiurnalGridpoints.py

@@ -83,8 +83,7 @@ def main():
  ascFile.month = monthname
  ascname = os.path.join(os.path.abspath(args.results_dir), ascFile())
 
- if not os.path.exists(os.path.dirname(ascname)):
- os.makedirs(os.path.dirname(ascname))
+ os.makedirs(os.path.dirname(ascname), exist_ok=True)
  fasc = open(ascname, "w")
 
  gridptlats = [float(x) for x in args.lats]

pcmdi_metrics/diurnal/scripts/savg_fourier.py

@@ -225,8 +225,7 @@ def spacevavg(tvarb1, tvarb2, sftlf, model):
  return outD
 
  print("Preparing to write output to JSON file ...")
- if not os.path.exists(args.results_dir):
- os.makedirs(args.results_dir)
+ os.makedirs(args.results_dir, exist_ok=True)
  jsonFile = populateStringConstructor(args.outnamejson, args)
  jsonFile.month = monthname
 

pcmdi_metrics/diurnal/scripts/std_of_dailymeans.py

@@ -131,8 +131,7 @@ def compute(param):
  print("TEMPLATE NAME:", template())
 
  print("Preparing to write output to JSON file ...")
- if not os.path.exists(args.results_dir):
- os.makedirs(args.results_dir)
+ os.makedirs(args.results_dir, exist_ok=True)
  jsonFile = populateStringConstructor(args.outnamejson, args)
  jsonFile.month = monthname
 

pcmdi_metrics/diurnal/scripts/std_of_hourlyvalues.py

@@ -142,8 +142,7 @@ def compute(param):
  # lonrange = (285.0, 295.0)
 
  print("Preparing to write output to JSON file ...")
- if not os.path.exists(args.results_dir):
- os.makedirs(args.results_dir)
+ os.makedirs(args.results_dir, exist_ok=True)
  jsonFile = populateStringConstructor(args.outnamejson, args)
  jsonFile.month = monthname
 

pcmdi_metrics/diurnal/scripts/std_of_meandiurnalcycle.py

@@ -143,8 +143,7 @@ def compute(param):
  # lonrange = (285.0, 295.0)
 
  print("Preparing to write output to JSON file ...")
- if not os.path.exists(args.results_dir):
- os.makedirs(args.results_dir)
+ os.makedirs(args.results_dir, exist_ok=True)
  jsonFile = populateStringConstructor(args.outnamejson, args)
  jsonFile.month = monthname
 

pcmdi_metrics/enso/enso_driver.py

@@ -125,8 +125,7 @@
 
 # Create output directory
 for output_type in ["graphics", "diagnostic_results", "metrics_results"]:
- if not os.path.exists(outdir(output_type=output_type)):
- os.makedirs(outdir(output_type=output_type))
+ os.makedirs(outdir(output_type=output_type), exist_ok=True)
  print("output directory for " + output_type + ":" + outdir(output_type=output_type))
 
 # list of variables

pcmdi_metrics/enso/scripts_pcmdi/enso_driver_obsOnly.py

@@ -104,8 +104,7 @@
 
 # Create output directory
 for output_type in ["graphics", "diagnostic_results", "metrics_results"]:
- if not os.path.exists(outdir(output_type=output_type)):
- os.makedirs(outdir(output_type=output_type))
+ os.makedirs(outdir(output_type=output_type), exist_ok=True)
  print(outdir(output_type=output_type))
 
 # list of variables

pcmdi_metrics/enso/scripts_pcmdi/parallel_driver.py

@@ -94,8 +94,7 @@
 # Create output directories
 # -------------------------------------------------
 for output_type in ["graphics", "diagnostic_results", "metrics_results"]:
- if not os.path.exists(outdir(output_type=output_type)):
- os.makedirs(outdir(output_type=output_type))
+ os.makedirs(outdir(output_type=output_type), exist_ok=True)
  print(outdir(output_type=output_type))
 
 # =================================================

pcmdi_metrics/mean_climate/scripts/pcmdi_compute_climatologies-CMOR.py

@@ -668,8 +668,7 @@ def runClim(A):
  print(
  "Your Python does not have CMOR, using regular cdms to write out files"
  )
- if not os.path.exists(A.results_dir):
- os.makedirs(A.results_dir)
+ os.makedirs(A.results_dir, exist_ok=True)
  end_tc = tc[-1].add(1, cdtime.Month)
 
  # Populate fout template with values

pcmdi_metrics/mjo/lib/debug_chk_plot.py

@@ -7,8 +7,7 @@
 
 def debug_chk_plot(d_seg_x_ano, Power, OEE, segment_year, daSeaCyc, segment_ano_year):
 
- if not os.path.exists("debug"):
- os.makedirs("debug")
+ os.makedirs("debug", exist_ok=True)
 
  """ FIX ME ---
  x = vcs.init()

pcmdi_metrics/mjo/lib/mjo_metric_calc.py

@@ -159,15 +159,13 @@ def mjo_metric_ewr_calculation(
 
  # NetCDF output
  if nc_out:
- if not os.path.exists(outdir(output_type="diagnostic_results")):
- os.makedirs(outdir(output_type="diagnostic_results"))
+ os.makedirs(outdir(output_type="diagnostic_results"), exist_ok=True)
  fout = os.path.join(outdir(output_type="diagnostic_results"), output_filename)
  write_netcdf_output(OEE, fout)
 
  # Plot
  if plot:
- if not os.path.exists(outdir(output_type="graphics")):
- os.makedirs(outdir(output_type="graphics"))
+ os.makedirs(outdir(output_type="graphics"), exist_ok=True)
  fout = os.path.join(outdir(output_type="graphics"), output_filename)
  title = (
  mip.upper()

pcmdi_metrics/mjo/lib/post_process_plot.py

@@ -22,8 +22,7 @@ def main():
  imgdir = "/work/lee1043/imsi/result_test/mjo_metrics/plot_test"
  # imgdir = '/p/user_pub/pmp/pmp_results/pmp_v1.1.2/graphics/mjo/'+mip+'/historical/'+version
 
- if not os.path.exists(imgdir):
- os.makedirs(imgdir)
+ os.makedirs(imgdir, exist_ok=True)
 
  ncfile_list = glob.glob(os.path.join(datadir, "*.nc"))
 

pcmdi_metrics/mjo/mjo_metrics_driver.py

@@ -137,8 +137,7 @@
 
 # Create output directory
 for output_type in ["graphics", "diagnostic_results", "metrics_results"]:
- if not os.path.exists(outdir(output_type=output_type)):
- os.makedirs(outdir(output_type=output_type))
+ os.makedirs(outdir(output_type=output_type), exist_ok=True)
  print(outdir(output_type=output_type))
 
 # Generate CMEC compliant json

pcmdi_metrics/mjo/scripts/parallel_driver.py

@@ -91,8 +91,7 @@
 # Create output directories
 # -------------------------------------------------
 for output_type in ["graphics", "diagnostic_results", "metrics_results"]:
- if not os.path.exists(outdir(output_type=output_type)):
- os.makedirs(outdir(output_type=output_type))
+ os.makedirs(outdir(output_type=output_type), exist_ok=True)
  print(outdir(output_type=output_type))
 
 # =================================================

pcmdi_metrics/monsoon_sperber/driver_monsoon_sperber.py

@@ -139,8 +139,7 @@ def tree():
 
 # Create output directory
 for output_type in ["graphics", "diagnostic_results", "metrics_results"]:
- if not os.path.exists(outdir(output_type=output_type)):
- os.makedirs(outdir(output_type=output_type))
+ os.makedirs(outdir(output_type=output_type), exist_ok=True)
  print(outdir(output_type=output_type))
 
 # Debug

pcmdi_metrics/precip_variability/scripts_pcmdi/calc_ratio.py

@@ -39,8 +39,7 @@
  / psdmfm_ref["RESULTS"][dat_ref][frc][dom][frq]
  )
 
- if not (os.path.isdir(outdir)):
- os.makedirs(outdir)
+ os.makedirs(outdir, exist_ok=True)
  outfile = open(os.path.join(outdir, model.split("/")[-1]), "w")
  json.dump(psdmfm, outfile, sort_keys=True, indent=4, separators=(",", ": "))
  outfile.close()

pcmdi_metrics/precip_variability/variability_across_timescales_PS_driver.py

@@ -39,11 +39,7 @@
  str(outdir_template(output_type="%(output_type)", mip=mip, case_id=case_id))
 )
 for output_type in ["graphics", "diagnostic_results", "metrics_results"]:
- if not os.path.exists(outdir(output_type=output_type)):
- try:
- os.makedirs(outdir(output_type=output_type))
- except FileExistsError:
- pass
+ os.makedirs(outdir(output_type=output_type), exist_ok=True)
  print(outdir(output_type=output_type))
 
 # Check data in advance

pcmdi_metrics/variability_mode/scripts_pcmdi/parallel_driver.py

@@ -99,8 +99,7 @@
 # Create output directories
 # -------------------------------------------------
 for output_type in ["graphics", "diagnostic_results", "metrics_results"]:
- if not os.path.exists(outdir(output_type=output_type)):
- os.makedirs(outdir(output_type=output_type))
+ os.makedirs(outdir(output_type=output_type), exist_ok=True)
  print(outdir(output_type=output_type))
 
 # =================================================

pcmdi_metrics/variability_mode/variability_modes_driver.py

@@ -269,8 +269,7 @@
 # Create output directories
 # -------------------------------------------------
 for output_type in ["graphics", "diagnostic_results", "metrics_results"]:
- if not os.path.exists(outdir(output_type=output_type)):
- os.makedirs(outdir(output_type=output_type))
+ os.makedirs(outdir(output_type=output_type), exist_ok=True)
  print(outdir(output_type=output_type))
 
 # =================================================

tests/deprecated/basepmpgraphics.py

@@ -40,8 +40,7 @@ def setUp(self):
  # self.x.open()
  self.orig_cwd = os.getcwd()
  self.pngsdir = "tests_png"
- if not os.path.exists(self.pngsdir):
- os.makedirs(self.pngsdir)
+ os.makedirs(self.pngsdir, exist_ok=True)
  self.basedir = os.path.join(os.path.dirname(__file__), "graphics")
 
 

tests/test_resources.py

@@ -9,7 +9,7 @@ def test_conda_env(tmpdir):
 
  pmp_share_path = os.path.join(conda_prefix, "share", "pmp")
 
- os.makedirs(pmp_share_path)
+ os.makedirs(pmp_share_path, exist_ok=True)
 
  with mock.patch.dict(os.environ, {"CONDA_PREFIX": conda_prefix}):
  path = resources.resource_path()
@@ -27,7 +27,7 @@ def test_conda_env_no_exist(resource_filename, getcwd, tmpdir):
 
  getcwd_path = os.path.join(tmpdir, "share", "pmp")
 
- os.makedirs(getcwd_path)
+ os.makedirs(getcwd_path, exist_ok=True)
 
  getcwd.return_value = tmpdir