Fixes to energy extension -- now works on Rhea (only). Also, minor fixes to...

Fixes to energy extension -- now works on Rhea (only). Also, minor fixes to smb and clouds extensions.

clouds/clouds_cesm.py

@@ -64,12 +64,12 @@ def run(name, config):
 
     # PLOTS
     img_list = []
-    img_list.extend( clouds_high.make_plot(config, out_path=img_dir))
-    img_list.extend(  clouds_low.make_plot(config, out_path=img_dir))
+    img_list.extend(clouds_high.make_plot(config, out_path=img_dir))
+    img_list.extend(clouds_low.make_plot(config, out_path=img_dir))
     img_list.extend(clouds_total.make_plot(config, out_path=img_dir))
-    img_list.extend(   yrly_high.make_plot(config, out_path=img_dir))
-    img_list.extend(    yrly_low.make_plot(config, out_path=img_dir))
-    img_list.extend(  yrly_total.make_plot(config, out_path=img_dir))
+    img_list.extend(yrly_high.make_plot(config, out_path=img_dir))
+    img_list.extend(yrly_low.make_plot(config, out_path=img_dir))
+    img_list.extend(yrly_total.make_plot(config, out_path=img_dir))
 
     element_list = [el.gallery('Figures', img_list)]
     ref_bib = utils.bib2html(config['references'])

energy/energy/cesm_racmo23_albedo.py

@@ -84,9 +84,9 @@ def make_plot(config=None, out_path='.',
     wkres = Ngl.Resources()
     # wkres.wkColorMap = "matlab_jet"
     wkres.wkColorMap = "BlueWhiteOrangeRed"
-    wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
+    # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
-    wks_img = os.path.join(out_path, "CESM_RACMO23_albedo_JJA")
+    wks_img = str(os.path.join(out_path, "CESM_RACMO23_albedo_JJA"))
     wks = Ngl.open_wks(wks_type, wks_img, wkres)
 
     # --- for the map -------
@@ -221,8 +221,6 @@ def make_plot(config=None, out_path='.',
 
     Ngl.panel(wks, plot, [1, nmap])
 
-    Ngl.end()
-
     img_link = os.path.join(os.path.basename(out_path),
                             os.path.basename(wks_img + '.' + wks_type))
     img_elem = el.image('CESM_RACMO23_albedo',

energy/energy/cesm_racmo23_latf.py

@@ -84,9 +84,9 @@ def make_plot(config=None, out_path='.',
     wkres = Ngl.Resources()
     # wkres.wkColorMap = "matlab_jet"
     wkres.wkColorMap = "BlueWhiteOrangeRed"
-    wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
+    # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
-    wks_img = os.path.join(out_path, "CESM_RACMO23_latf_JJA")
+    wks_img = str(os.path.join(out_path, "CESM_RACMO23_latf_JJA"))
     wks = Ngl.open_wks(wks_type, wks_img, wkres)
     
     # --- for the map -------
@@ -219,8 +219,6 @@ def make_plot(config=None, out_path='.',
     Ngl.overlay(plot[2], usrf_plot3)
     
     Ngl.panel(wks, plot, [1, nmap])
-    
-    Ngl.end()
 
     img_link = os.path.join(os.path.basename(out_path),
                             os.path.basename(wks_img + '.' + wks_type))

energy/energy/cesm_racmo23_lwsd.py

@@ -82,9 +82,9 @@ def make_plot(config=None, out_path='.',
     wkres = Ngl.Resources()
     # wkres.wkColorMap = "matlab_jet"
     wkres.wkColorMap = "BlueWhiteOrangeRed"
-    wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
+    # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
-    wks_img = os.path.join(out_path, "CESM_RACMO23_lwsd_JJA")
+    wks_img = str(os.path.join(out_path, "CESM_RACMO23_lwsd_JJA"))
     wks = Ngl.open_wks(wks_type, wks_img, wkres)
 
     # --- for the map -------
@@ -222,8 +222,6 @@ def make_plot(config=None, out_path='.',
 
     Ngl.panel(wks, plot, [1, nmap])
 
-    Ngl.end()
-
     img_link = os.path.join(os.path.basename(out_path),
                             os.path.basename(wks_img + '.' + wks_type))
     img_elem = el.image('CESM_RACMO23_lwsd',

energy/energy/cesm_racmo23_lwsn.py

@@ -91,9 +91,9 @@ def make_plot(config=None, out_path='.',
     wkres = Ngl.Resources()
     # wkres.wkColorMap = "matlab_jet"
     wkres.wkColorMap = "BlueWhiteOrangeRed"
-    wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
+    # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
-    wks_img = os.path.join(out_path, "CESM_RACMO23_lwsn_JJA")
+    wks_img = str(os.path.join(out_path, "CESM_RACMO23_lwsn_JJA"))
     wks = Ngl.open_wks(wks_type, wks_img, wkres)
 
     # --- for the map -------
@@ -230,8 +230,6 @@ def make_plot(config=None, out_path='.',
 
     Ngl.panel(wks, plot, [1, nmap])
 
-    Ngl.end()
-
     img_link = os.path.join(os.path.basename(out_path),
                             os.path.basename(wks_img + '.' + wks_type))
     img_elem = el.image('CESM_RACMO23_lwsn',

energy/energy/cesm_racmo23_rnet.py

@@ -98,9 +98,9 @@ def make_plot(config=None, out_path='.',
     wkres = Ngl.Resources()
     # wkres.wkColorMap = "matlab_jet"
     wkres.wkColorMap = "BlueWhiteOrangeRed"
-    wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
+    # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
-    wks_img = os.path.join(out_path, "CESM_RACMO23_rnet_JJA")
+    wks_img = str(os.path.join(out_path, "CESM_RACMO23_rnet_JJA"))
     wks = Ngl.open_wks(wks_type, wks_img, wkres)
 
     # --- for the map -------
@@ -237,8 +237,6 @@ def make_plot(config=None, out_path='.',
 
     Ngl.panel(wks, plot, [1, nmap])
 
-    Ngl.end()
-
     img_link = os.path.join(os.path.basename(out_path),
                             os.path.basename(wks_img + '.' + wks_type))
     img_elem = el.image('CESM_RACMO23_rnet',

energy/energy/cesm_racmo23_senf.py

@@ -86,9 +86,9 @@ def make_plot(config=None, out_path='.',
     wkres = Ngl.Resources()
     # wkres.wkColorMap = "matlab_jet"
     wkres.wkColorMap = "BlueWhiteOrangeRed"
-    wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
+    # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
-    wks_img = os.path.join(out_path, "CESM_RACMO23_senf_JJA")
+    wks_img = str(os.path.join(out_path, "CESM_RACMO23_senf_JJA"))
     wks = Ngl.open_wks(wks_type, wks_img, wkres)
 
     # --- for the map -------
@@ -222,8 +222,6 @@ def make_plot(config=None, out_path='.',
 
     Ngl.panel(wks, plot, [1, nmap])
 
-    Ngl.end()
-
     img_link = os.path.join(os.path.basename(out_path),
                             os.path.basename(wks_img + '.' + wks_type))
     img_elem = el.image('CESM_RACMO23_senf',

energy/energy/cesm_racmo23_smb.py

@@ -93,9 +93,9 @@ def make_plot(config=None, out_path='.',
     wkres = Ngl.Resources()
     # wkres.wkColorMap = "matlab_jet"
     wkres.wkColorMap = "BlueWhiteOrangeRed"
-    wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
+    # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
-    wks_img = os.path.join(out_path, "CESM_RACMO23_smb_ANN")
+    wks_img = str(os.path.join(out_path, "CESM_RACMO23_smb_ANN"))
     wks = Ngl.open_wks(wks_type, wks_img, wkres)
 
     # --- for the map -------
@@ -245,8 +245,6 @@ def make_plot(config=None, out_path='.',
 
     Ngl.panel(wks, plot, [1, nmap])
 
-    Ngl.end()
-
     img_link = os.path.join(os.path.basename(out_path),
                             os.path.basename(wks_img + '.' + wks_type))
     img_elem = el.image('CESM_RACMO23_smb',

energy/energy/cesm_racmo23_swsd.py

@@ -84,9 +84,9 @@ def make_plot(config=None, out_path='.',
     wkres = Ngl.Resources()
     # wkres.wkColorMap = "matlab_jet"
     wkres.wkColorMap = "BlueWhiteOrangeRed"
-    wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
+    # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
-    wks_img = os.path.join(out_path, "CESM_RACMO23_swsd_JJA")
+    wks_img = str(os.path.join(out_path, "CESM_RACMO23_swsd_JJA"))
     wks = Ngl.open_wks(wks_type, wks_img, wkres)
 
     # --- for the map -------
@@ -220,8 +220,6 @@ def make_plot(config=None, out_path='.',
 
     Ngl.panel(wks, plot, [1, nmap])
 
-    Ngl.end()
-
     img_link = os.path.join(os.path.basename(out_path),
                             os.path.basename(wks_img + '.' + wks_type))
     img_elem = el.image('CESM_RACMO23_swsd',

energy/energy/cesm_racmo23_swsn.py

@@ -84,9 +84,9 @@ def make_plot(config=None, out_path='.',
     wkres = Ngl.Resources()
     # wkres.wkColorMap = "matlab_jet"
     wkres.wkColorMap = "BlueWhiteOrangeRed"
-    wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
+    # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
-    wks_img = os.path.join(out_path, "CESM_RACMO23_swsn_JJA")
+    wks_img = str(os.path.join(out_path, "CESM_RACMO23_swsn_JJA"))
     wks = Ngl.open_wks(wks_type, wks_img, wkres)
 
     # --- for the map -------
@@ -224,8 +224,6 @@ def make_plot(config=None, out_path='.',
 
     Ngl.panel(wks, plot, [1, nmap])
 
-    Ngl.end()
-
     img_link = os.path.join(os.path.basename(out_path),
                             os.path.basename(wks_img + '.' + wks_type))
     img_elem = el.image('CESM_RACMO23_swsn',

energy/energy/cesm_racmo23_t2m_ann.py

@@ -77,9 +77,9 @@ def make_plot(config=None, out_path='.',
     # Open a workstation for drawing the plots
     wkres = Ngl.Resources()
     wkres.wkColorMap = "BlueWhiteOrangeRed"
-    wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
+    # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
-    wks_img = os.path.join(out_path, "CESM_RACMO23_t2m_ANN")
+    wks_img = str(os.path.join(out_path, "CESM_RACMO23_t2m_ANN"))
     wks = Ngl.open_wks(wks_type, wks_img, wkres)
 
     # --- for the map -------
@@ -213,8 +213,6 @@ def make_plot(config=None, out_path='.',
 
     Ngl.panel(wks, plot, [1, nmap])
 
-    Ngl.end()
-
     img_link = os.path.join(os.path.basename(out_path),
                             os.path.basename(wks_img + '.' + wks_type))
     img_elem = el.image('CESM_RACMO23_t2m_ann',

energy/energy/cesm_racmo23_t2m_djf.py

@@ -78,9 +78,9 @@ def make_plot(config=None, out_path='.',
     wkres = Ngl.Resources()
     # wkres.wkColorMap = "WhiteBlueGreenYellowRed"
     wkres.wkColorMap = "BlueWhiteOrangeRed"
-    wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
+    # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
-    wks_img = os.path.join(out_path, "CESM_RACMO23_t2m_DJF")
+    wks_img = str(os.path.join(out_path, "CESM_RACMO23_t2m_DJF"))
     wks = Ngl.open_wks(wks_type, wks_img, wkres)
 
     # --- for the map -------
@@ -214,8 +214,6 @@ def make_plot(config=None, out_path='.',
 
     Ngl.panel(wks, plot, [1, nmap])
 
-    Ngl.end()
-
     img_link = os.path.join(os.path.basename(out_path),
                             os.path.basename(wks_img + '.' + wks_type))
     img_elem = el.image('CESM_RACMO23_t2m_djf',

energy/energy/cesm_racmo23_t2m_jja.py

@@ -78,9 +78,9 @@ def make_plot(config=None, out_path='.',
     wkres = Ngl.Resources()
     # wkres.wkColorMap = "WhiteBlueGreenYellowRed"
     wkres.wkColorMap = "BlueWhiteOrangeRed"
-    wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
+    # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
-    wks_img = os.path.join(out_path, "CESM_RACMO23_t2m_JJA")
+    wks_img = str(os.path.join(out_path, "CESM_RACMO23_t2m_JJA"))
     wks = Ngl.open_wks(wks_type, wks_img, wkres)
     # wks = Ngl.open_wks(wks_type,"CESM_RACMO23_t2m_JJA",wkres)
 
@@ -214,8 +214,6 @@ def make_plot(config=None, out_path='.',
 
     Ngl.panel(wks, plot, [1, nmap])
 
-    Ngl.end()
-
     img_link = os.path.join(os.path.basename(out_path),
                             os.path.basename(wks_img + '.' + wks_type))
     img_elem = el.image('CESM_RACMO23_t2m_jja',

energy/energy/timeseries_acab.py

@@ -6,7 +6,7 @@ from netCDF4 import Dataset
 
 from livvkit.util import elements as el
 
-describe = """TimeSeries_T2M and BoxPlot_T2M plot."""
+describe = """TimeSeries_SMB and BoxPlot_SMB plot."""
 
 
 def make_plot(config=None, out_path='.',
@@ -111,7 +111,7 @@ def make_plot(config=None, out_path='.',
 
     img_link = os.path.join(os.path.basename(out_path),
                             os.path.basename(bx_img_path))
-    img_elem = el.image('BoxPlot_QICE_GT',
+    img_elem = el.image('BoxPlot_SMB',
                         ' '.join(describe.split()),
                         img_link)
     if config:

energy/energy/timeseries_qice.py

@@ -6,7 +6,7 @@ from netCDF4 import Dataset
 
 from livvkit.util import elements as el
 
-describe = """TimeSeries_T2M and BoxPlot_T2M plot."""
+describe = """TimeSeries_QICE and BoxPlot_QICE plot."""
 
 
 def make_plot(config=None, out_path='.',

energy/energy/timeseries_qice_gt.py

@@ -6,7 +6,7 @@ from netCDF4 import Dataset
 
 from livvkit.util import elements as el
 
-describe = """TimeSeries_T2M and BoxPlot_T2M plot."""
+describe = """TimeSeries_QICE_GT and BoxPlot_QICE_GT plot."""
 
 
 def make_plot(config=None, out_path='.',

energy/energy_cesm.py

@@ -84,28 +84,28 @@ def run(name, config):
     cesm2_aavg_title = """Area weighted averages of CESM2's energy balance variables."""
     racmo_aavg_title = """Area weighted averages of RACMO's energy balance variables."""
 
-    element_list.append(el.table(cesm_aavg_title, cesm_aavg.keys(), cesm_aavg))
-    element_list.append(el.table(cesm2_aavg_title, cesm2_aavg.keys(), cesm2_aavg))
-    element_list.append(el.table(racmo_aavg_title, racmo_aavg.keys(), racmo_aavg))
+    element_list.append(el.vtable(cesm_aavg_title, cesm_aavg.keys(), cesm_aavg))
+    element_list.append(el.vtable(cesm2_aavg_title, cesm2_aavg.keys(), cesm2_aavg))
+    element_list.append(el.vtable(racmo_aavg_title, racmo_aavg.keys(), racmo_aavg))
 
     # PLOTS
     img_list = []
-    img_list.extend(cesm_albedo.make_plot(config))
-    img_list.extend(cesm_latf.make_plot(config))
-    img_list.extend(cesm_lwsd.make_plot(config))
-    img_list.extend(cesm_lwsn.make_plot(config))
-    img_list.extend(cesm_rnet.make_plot(config))
-    img_list.extend(cesm_senf.make_plot(config))
-    img_list.extend(cesm_smb.make_plot(config))
-    img_list.extend(cesm_swsd.make_plot(config))
-    img_list.extend(cesm_swsn.make_plot(config))
-    img_list.extend(t2m_ann.make_plot(config))
-    img_list.extend(t2m_djf.make_plot(config))
-    img_list.extend(t2m_jja.make_plot(config))
-    img_list.extend(ts_trefht.make_plot(config))
-    img_list.extend(ts_qice_gt.make_plot(config))
-    img_list.extend(ts_qice.make_plot(config))
-    img_list.extend(ts_acab.make_plot(config))
+    img_list.extend(cesm_albedo.make_plot(config, out_path=img_dir))
+    img_list.extend(  cesm_latf.make_plot(config, out_path=img_dir))
+    img_list.extend(  cesm_lwsd.make_plot(config, out_path=img_dir))
+    img_list.extend(  cesm_lwsn.make_plot(config, out_path=img_dir))
+    img_list.extend(  cesm_rnet.make_plot(config, out_path=img_dir))
+    img_list.extend(  cesm_senf.make_plot(config, out_path=img_dir))
+    img_list.extend(   cesm_smb.make_plot(config, out_path=img_dir))
+    img_list.extend(  cesm_swsd.make_plot(config, out_path=img_dir))
+    img_list.extend(  cesm_swsn.make_plot(config, out_path=img_dir))
+    img_list.extend(    t2m_ann.make_plot(config, out_path=img_dir))
+    img_list.extend(    t2m_djf.make_plot(config, out_path=img_dir))
+    img_list.extend(    t2m_jja.make_plot(config, out_path=img_dir))
+    img_list.extend(  ts_trefht.make_plot(config, out_path=img_dir))
+    img_list.extend( ts_qice_gt.make_plot(config, out_path=img_dir))
+    img_list.extend(    ts_qice.make_plot(config, out_path=img_dir))
+    img_list.extend(    ts_acab.make_plot(config, out_path=img_dir))
 
     element_list.append(el.gallery('Figures', img_list))
     ref_bib = utils.bib2html(config['references'])

smb/smb/plot_core_transects.py

@@ -126,7 +126,8 @@ def main(args):
     #%% Elevation vs. SMB scatters: 4-panel - 4 glacier transects
     working = SMBdf_avg[SMBdf_avg.thk_flag==1]
     glacier_list = ['414','180','215','454']
-    glac_longnames = ['Qamanârssêp Sermia','Nioghalfvjerdsfjorden','Storstrømmen','K-transect']
+    # glac_longnames = ['Qamanârssêp Sermia','Nioghalfvjerdsfjorden','Storstrømmen','K-transect']
+    glac_longnames = ['Qamanarssep Sermia','Nioghalfvjerdsfjorden','Storstrommen','K-transect']
 
     #Function to grab indices in SMBdf (observed and modeled) given a particular glacier
     #These are the same transects used in Noel et al., 2016
@@ -148,7 +149,7 @@ def main(args):
             glacplot.set_ylabel(' ')
         if i<2:
             glacplot.set_xlabel(' ')   
-        glacplot.set_title(glac_longnames[i],size=12)
+        glacplot.set_title(glac_longnames[i], size=12)
 
     plt.tight_layout()
     img_file = os.path.join(args.out, 'core_transects.png')