Merge branch 'kevans32/val_v1' into develop

* kevans32/val_v1:
  updated plots for better color schemes

clouds/clouds/cesm_cldhgh_ann.py

@@ -63,8 +63,8 @@ def make_plot(config, out_path='.'):
 
     # ------- PLOT --------
     # Open a workstation for drawing the plots
+    cmap = ["grey98","grey94","grey90","grey86","grey80","grey74","grey68","grey60","grey52","grey44","grey36"]
     wkres = Ngl.Resources()
-    wkres.wkColorMap = "BlueWhiteOrangeRed"
     # wkres.wkOrientation = "portrait"
     wks_type = "png"
     wks_img = str(os.path.join(out_path, 'CESM_cldhgh_ANN'))
@@ -93,6 +93,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the CESM contour -------
     res1 = Ngl.Resources()
+    res1.cnFillPalette = "percent_11lev"
     res1.nglDraw = False  # Don't draw individual plots
     res1.nglFrame = False  # Don't advance frame.
     res1.cnLineLabelsOn = False
@@ -111,6 +112,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the data contour -------
     res2 = Ngl.Resources()
+    res2.cnFillPalette = "percent_11lev"
     res2.nglDraw = False  # Don't draw individual plots
     res2.nglFrame = False  # Don't advance frame.
     res2.cnLineLabelsOn = False
@@ -130,6 +132,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the data contour -------
     res3 = Ngl.Resources()
+    res3.cnFillPalette = "percent_11lev"
     res3.nglDraw = False  # Don't draw individual plots
     res3.nglFrame = False  # Don't advance frame.
     res3.cnLineLabelsOn = False

clouds/clouds/cesm_cldlow_ann.py

@@ -63,9 +63,8 @@ def make_plot(config, out_path='.'):
 
     # ------- PLOT --------
     #  Open a workstation for drawing the plots
+    #cmap = ["grey98","grey94","grey90","grey86","grey80","grey74","grey68","grey60","grey52","grey44","grey36"]
     wkres = Ngl.Resources()
-    # wkres.wkColorMap = "WhiteBlueGreenYellowRed"
-    wkres.wkColorMap = "BlueWhiteOrangeRed"
     # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
     wks_img = str(os.path.join(out_path, "CESM_cldlow_ANN"))
@@ -93,6 +92,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the CESM contour -------
     res1 = Ngl.Resources()
+    res1.cnFillPalette = "percent_11lev"
     res1.nglDraw = False  # Don't draw individual plots
     res1.nglFrame = False  # Don't advance frame.
     res1.cnLineLabelsOn = False
@@ -111,6 +111,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the data contour -------
     res2 = Ngl.Resources()
+    res2.cnFillPalette = "percent_11lev"
     res2.nglDraw = False  # Don't draw individual plots
     res2.nglFrame = False  # Don't advance frame.
     res2.cnLineLabelsOn = False
@@ -130,6 +131,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the data contour -------
     res3 = Ngl.Resources()
+    res3.cnFillPalette = "percent_11lev"
     res3.nglDraw = False  # Don't draw individual plots
     res3.nglFrame = False  # Don't advance frame.
     res3.cnLineLabelsOn = False

clouds/clouds/cesm_cldtot_ann.py

@@ -63,9 +63,8 @@ def make_plot(config, out_path='.'):
     
     # ------- PLOT --------
     #  Open a workstation for drawing the plots
+    cmap = ["grey98","grey94","grey90","grey86","grey80","grey74","grey68","grey60","grey52","grey44","grey36"]
     wkres = Ngl.Resources()
-    # wkres.wkColorMap = "WhiteBlueGreenYellowRed"
-    wkres.wkColorMap = "BlueWhiteOrangeRed"
     # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
     wks_img = str(os.path.join(out_path, "CESM_cldtot_ANN"))
@@ -93,6 +92,7 @@ def make_plot(config, out_path='.'):
     
     # --- for the CESM contour -------
     res1 = Ngl.Resources()
+    res1.cnFillPalette = "percent_11lev"
     res1.nglDraw = False  # Don't draw individual plots
     res1.nglFrame = False  # Don't advance frame.
     res1.cnLineLabelsOn = False
@@ -111,6 +111,7 @@ def make_plot(config, out_path='.'):
     
     # --- for the data contour -------
     res2 = Ngl.Resources()
+    res2.cnFillPalette = "percent_11lev"
     res2.nglDraw = False  # Don't draw individual plots
     res2.nglFrame = False  # Don't advance frame.
     res2.cnLineLabelsOn = False
@@ -130,6 +131,7 @@ def make_plot(config, out_path='.'):
     
     # --- for the data contour -------
     res3 = Ngl.Resources()
+    res3.cnFillPalette = "percent_11lev"
     res3.nglDraw = False  # Don't draw individual plots
     res3.nglFrame = False  # Don't advance frame.
     res3.cnLineLabelsOn = False

dynamics/dynamics/cisma_js_standalone.py

@@ -60,7 +60,6 @@ def make_plot(config, out_path='.'):
     # ------- PLOT --------
     # Open a workstation for drawing the plots
     wkres = Ngl.Resources()
-    wkres.wkColorMap = "WhiteBlueGreenYellowRed"
     # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
     wks_img = str(os.path.join(out_path, "CISMA_js"))
@@ -89,6 +88,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the file1 contour -------
     res1 = Ngl.Resources()
+    res1.cnFillPalette = "WhiteYellowOrangeRed"
     res1.nglDraw = False  # Don't draw individual plots
     res1.nglFrame = False  # Don't advance frame.
     res1.cnLineLabelsOn = False
@@ -109,6 +109,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the file2 contour -------
     res2 = Ngl.Resources()
+    res2.cnFillPalette = "WhiteYellowOrangeRed"
     res2.nglDraw = False  # Don't draw individual plots
     res2.nglFrame = False  # Don't advance frame.
     res2.cnLineLabelsOn = False
@@ -129,6 +130,7 @@ def make_plot(config, out_path='.'):
 
     # --- for diff=file1-file2 contour -------
     res22 = Ngl.Resources()
+    res22.cnFillPalette = "BlueWhiteOrangeRed"
     res22.nglDraw = False  # Don't draw individual plots
     res22.nglFrame = False  # Don't advance frame.
     res22.cnLineLabelsOn = False
@@ -138,7 +140,7 @@ def make_plot(config, out_path='.'):
     res22.cnFillMode = "RasterFill"
     res22.trGridType = "TriangularMesh"
     res22.cnLevelSelectionMode = "ExplicitLevels"
-    res22.cnLevels = (0, 1, 2, 10, 30, 70, 100, 200, 500, 1000, 2000)
+    res22.cnLevels = (-500,-200,-100,-75,-50,-10,0,10,50,75,100,200,500)
     res22.lbLabelBarOn = True  # Turn on labelbar.
     res22.lbOrientation = "Horizontal"  # Verticle labelbar
     res22.lbLabelFontHeightF = 0.02  # Make fonts smaller.

dynamics/dynamics/cisma_pm_standalone.py

@@ -60,7 +60,6 @@ def make_plot(config, out_path='.'):
     # ------- PLOT --------
     # Open a workstation for drawing the plots
     wkres = Ngl.Resources()
-    wkres.wkColorMap = "WhiteBlueGreenYellowRed"
     # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
     wks_img = str(os.path.join(out_path, "CISMA_pm"))
@@ -89,6 +88,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the file1 contour -------
     res1 = Ngl.Resources()
+    res1.cnFillPalette = "WhiteYellowOrangeRed"
     res1.nglDraw = False  # Don't draw individual plots
     res1.nglFrame = False  # Don't advance frame.
     res1.cnLineLabelsOn = False
@@ -109,6 +109,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the file2 contour -------
     res2 = Ngl.Resources()
+    res2.cnFillPalette = "WhiteYellowOrangeRed"
     res2.nglDraw = False  # Don't draw individual plots
     res2.nglFrame = False  # Don't advance frame.
     res2.cnLineLabelsOn = False
@@ -129,6 +130,7 @@ def make_plot(config, out_path='.'):
 
     # --- for diff=file1-file2 contour -------
     res22 = Ngl.Resources()
+    res22.cnFillPalette = "BlueWhiteOrangeRed"
     res22.nglDraw = False  # Don't draw individual plots
     res22.nglFrame = False  # Don't advance frame.
     res22.cnLineLabelsOn = False
@@ -138,7 +140,7 @@ def make_plot(config, out_path='.'):
     res22.cnFillMode = "RasterFill"
     res22.trGridType = "TriangularMesh"
     res22.cnLevelSelectionMode = "ExplicitLevels"
-    res22.cnLevels = (0, 1, 2, 10, 30, 70, 100, 200, 500, 1000, 2000)
+    res22.cnLevels = (-500,-200,-100,-75,-50,-10,0,10,50,75,100,200,500)
     res22.lbLabelBarOn = True  # Turn on labelbar.
     res22.lbOrientation = "Horizontal"  # Verticle labelbar
     res22.lbLabelFontHeightF = 0.02  # Make fonts smaller.

dynamics/dynamics/cisma_racmo23_standalone.py

@@ -81,7 +81,6 @@ def make_plot(config, out_path='.'):
     # ------- PLOT --------
     #  Open a workstation for drawing the plots
     wkres = Ngl.Resources()
-    wkres.wkColorMap = "WhiteBlueGreenYellowRed"
     # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
     wks_img = str(os.path.join(out_path, "CISMA_RACMO23"))
@@ -110,6 +109,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the file1 contour -------
     res1 = Ngl.Resources()
+    res1.cnFillPalette = "BlueWhiteOrangeRed"
     res1.nglDraw = False  # Don't draw individual plots
     res1.nglFrame = False  # Don't advance frame.
     res1.cnLineLabelsOn = False
@@ -132,6 +132,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the file2 contour -------
     res2 = Ngl.Resources()
+    res2.cnFillPalette = "BlueWhiteOrangeRed"
     res2.nglDraw = False  # Don't draw individual plots
     res2.nglFrame = False  # Don't advance frame.
     res2.cnLineLabelsOn = False
@@ -154,6 +155,7 @@ def make_plot(config, out_path='.'):
 
     # --- for diff=file1-file2 contour -------
     res22 = Ngl.Resources()
+    res22.cnFillPalette = "BlueWhiteOrangeRed"
     res22.nglDraw = False  # Don't draw individual plots
     res22.nglFrame = False  # Don't advance frame.
     res22.cnLineLabelsOn = False

dynamics/dynamics/cisma_temp_standalone.py

@@ -46,7 +46,6 @@ def make_plot(config, out_path='.'):
     # ------- PLOT --------
     #  Open a workstation for drawing the plots
     wkres = Ngl.Resources()
-    wkres.wkColorMap = "WhiteBlueGreenYellowRed"
     # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
     wks_img = str(os.path.join(out_path, "CISMA_temp"))
@@ -75,6 +74,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the file1 contour -------
     res1 = Ngl.Resources()
+    res1.cnFillPalette = "WhiteBlue"
     res1.nglDraw = False  # Don't draw individual plots
     res1.nglFrame = False  # Don't advance frame.
     res1.cnLineLabelsOn = False
@@ -95,6 +95,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the file2 contour -------
     res2 = Ngl.Resources()
+    res2.cnFillPalette = "WhiteBlue"
     res2.nglDraw = False  # Don't draw individual plots
     res2.nglFrame = False  # Don't advance frame.
     res2.cnLineLabelsOn = False
@@ -115,6 +116,7 @@ def make_plot(config, out_path='.'):
 
     # --- for diff=file1-file2 contour -------
     res22 = Ngl.Resources()
+    res22.cnFillPalette = "BlueWhiteOrangeRed"
     res22.nglDraw = False  # Don't draw individual plots
     res22.nglFrame = False  # Don't advance frame.
     res22.cnLineLabelsOn = False

dynamics/dynamics/cisma_velnorm_standalone.py

@@ -59,7 +59,6 @@ def make_plot(config, out_path='.'):
     # ------- PLOT --------
     # Open a workstation for drawing the plots
     wkres = Ngl.Resources()
-    wkres.wkColorMap = "WhiteBlueGreenYellowRed"
     # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
     wks_img = str(os.path.join(out_path, "CISMA_velnorm"))
@@ -88,6 +87,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the file1 contour -------
     res1 = Ngl.Resources()
+    res1.cnFillPalette = "WhiteYellowOrangeRed"
     res1.nglDraw = False  # Don't draw individual plots
     res1.nglFrame = False  # Don't advance frame.
     res1.cnLineLabelsOn = False
@@ -108,6 +108,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the file2 contour -------
     res2 = Ngl.Resources()
+    res2.cnFillPalette = "WhiteYellowOrangeRed"
     res2.nglDraw = False  # Don't draw individual plots
     res2.nglFrame = False  # Don't advance frame.
     res2.cnLineLabelsOn = False
@@ -128,6 +129,7 @@ def make_plot(config, out_path='.'):
 
     # --- for diff=file1-file2 contour -------
     res22 = Ngl.Resources()
+    res22.cnFillPalette = "BlueWhiteOrangeRed"
     res22.nglDraw = False  # Don't draw individual plots
     res22.nglFrame = False  # Don't advance frame.
     res22.cnLineLabelsOn = False
@@ -137,7 +139,7 @@ def make_plot(config, out_path='.'):
     res22.cnFillMode = "RasterFill"
     res22.trGridType = "TriangularMesh"
     res22.cnLevelSelectionMode = "ExplicitLevels"
-    res22.cnLevels = (0, 1, 2, 10, 30, 70, 100, 200, 500, 1000, 2000)
+    res22.cnLevels = (-500,-200,-100,-75,-50,-10,0,10,50,75,100,200,500)
     res22.lbLabelBarOn = True  # Turn on labelbar.
     res22.lbOrientation = "Horizontal"  # Verticle labelbar
     res22.lbLabelFontHeightF = 0.02  # Make fonts smaller.

dynamics/dynamics/cisma_zach_standalone.py

@@ -60,7 +60,6 @@ def make_plot(config, out_path='.'):
     # ------- PLOT --------
     # Open a workstation for drawing the plots
     wkres = Ngl.Resources()
-    wkres.wkColorMap = "WhiteBlueGreenYellowRed"
     # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
     wks_img = str(os.path.join(out_path, "CISMA_zach"))
@@ -89,6 +88,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the file1 contour -------
     res1 = Ngl.Resources()
+    res1.cnFillPalette = "WhiteYellowOrangeRed"
     res1.nglDraw = False  # Don't draw individual plots
     res1.nglFrame = False  # Don't advance frame.
     res1.cnLineLabelsOn = False
@@ -109,6 +109,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the file2 contour -------
     res2 = Ngl.Resources()
+    res2.cnFillPalette = "WhiteYellowOrangeRed"
     res2.nglDraw = False  # Don't draw individual plots
     res2.nglFrame = False  # Don't advance frame.
     res2.cnLineLabelsOn = False
@@ -129,6 +130,7 @@ def make_plot(config, out_path='.'):
 
     # --- for diff=file1-file2 contour -------
     res22 = Ngl.Resources()
+    res22.cnFillPalette = "BlueWhiteOrangeRed"
     res22.nglDraw = False  # Don't draw individual plots
     res22.nglFrame = False  # Don't advance frame.
     res22.cnLineLabelsOn = False
@@ -138,7 +140,7 @@ def make_plot(config, out_path='.'):
     res22.cnFillMode = "RasterFill"
     res22.trGridType = "TriangularMesh"
     res22.cnLevelSelectionMode = "ExplicitLevels"
-    res22.cnLevels = (0, 1, 2, 10, 30, 70, 100, 200, 500, 1000, 2000)
+    res22.cnLevels = (-500,-200,-100,-75,-50,-10,0,10,50,75,100,200,500)
     res22.lbLabelBarOn = True  # Turn on labelbar.
     res22.lbOrientation = "Horizontal"  # Verticle labelbar
     res22.lbLabelFontHeightF = 0.02  # Make fonts smaller.

energy/energy/cesm_racmo23_albedo.py

@@ -90,8 +90,6 @@ def make_plot(config, out_path='.'):
     # ------- PLOT --------
     #  Open a workstation for drawing the plots
     wkres = Ngl.Resources()
-    # wkres.wkColorMap = "matlab_jet"
-    wkres.wkColorMap = "BlueWhiteOrangeRed"
     # wkres.wkOrientation = "portrait"  # "portrait" or "landscape"
     wks_type = "png"
     wks_img = str(os.path.join(out_path, "CESM_RACMO23_albedo_JJA"))
@@ -119,6 +117,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the albedo contour of CESM -------
     res1 = Ngl.Resources()
+    res1.cnFillPalette = "WhiteYellowOrangeRed"
     res1.nglDraw = False  # Don't draw individual plots
     res1.nglFrame = False  # Don't advance frame.
     res1.cnLineLabelsOn = False
@@ -136,6 +135,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the albedo contour of RACMO -------
     res2 = Ngl.Resources()
+    res2.cnFillPalette = "WhiteYellowOrangeRed"
     res2.nglDraw = False  # Don't draw individual plots
     res2.nglFrame = False  # Don't advance frame.
     res2.cnLineLabelsOn = False
@@ -154,6 +154,7 @@ def make_plot(config, out_path='.'):
 
     # --- for the albedo contour of CESM-RACMO -------
     res3 = Ngl.Resources()
+    res3.cnFillPalette = "BlueWhiteOrangeRed"
     res3.nglDraw = False  # Don't draw individual plots
     res3.nglFrame = False  # Don't advance frame.
     res3.cnLineLabelsOn = False
@@ -162,7 +163,7 @@ def make_plot(config, out_path='.'):
     res3.cnLineLabelsOn = False
     res3.cnFillMode = "RasterFill"
     res3.cnLevelSelectionMode = "ExplicitLevels"
-    res3.cnLevels = [-0.2, -0.1, 0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6]
+    res3.cnLevels = [-0.6, -0.5, -0.4, -0.3, -0.2, -0.1, 0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6]
     res3.lbLabelBarOn = True  # Turn on labelbar.
     res3.lbOrientation = "Vertical"  # Verticle labelbar
     res3.lbLabelFontHeightF = 0.04  # Make fonts smaller.

energy/energy/cesm_racmo23_latf.py

@@ -90,8 +90,6 @@ def make_plot(config, out_path='.'):
     # ------- PLOT --------
     #  Open a workstation for drawing the plots
     wkres = Ngl.Resources()
-    # wkres.wkColorMap = "matlab_jet"