Merge branch 'master' of github.com:jjokella/pyshemkf

scripts/errorplot/runplot_figure_2_a.ipy

@@ -63,14 +63,14 @@ if is_plot:
         which_methods=which_methods_sorted,
         ensemble_sizes=ensemble_sizes,
         axistitle=model_name.upper(),
-        ylims=[0.29, 0.40],
+        ylims=[0.29, 0.3999],
         xlim_max=10,
         yticks=np.arange(0.3, 0.5, 0.02),
         fontleg=20,
         is_text=True,
         text_x=1.0,
         text_y=0.37,
-        # ylabel=r'RMSE  $\log(K/m^2)$'
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     # Save

scripts/errorplot/runplot_figure_4_a.ipy

@@ -71,6 +71,7 @@ if is_plot:
         is_text=True,
         text_x=1.0,
         text_y=0.85,
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     # Save

scripts/errorplot/runplot_figure_6_a.ipy

@@ -71,6 +71,7 @@ if is_plot:
         text_x=1.0,
         text_y=0.34,
         n_syn=100,
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     # Save

scripts/errorplot/runplot_figure_6_b.ipy

@@ -72,6 +72,7 @@ if is_plot:
         text_x=1.0,
         text_y=0.65,
         n_syn=100,
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     # Save

scripts/errorplot/runplot_figure_8_a.ipy

@@ -59,6 +59,8 @@ if is_plot:
                       r'Local EnKF $\lambda = 300$'],
         xlim_min=0.8,
         xdiff_nens=0.3,
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
+
     )
 
     # Save

scripts/errorplot/runplot_figure_8_b.ipy

@@ -62,7 +62,8 @@ if is_plot:
                       r'Hybrid EnKF $\beta = 0.75$'],
         xlim_min=0.8,
         xlim_max=4.0,
-        xdiff_nens=0.3
+        xdiff_nens=0.3,
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     # Save

scripts/errorplot/runplot_figure_8_c.ipy

@@ -60,6 +60,7 @@ if is_plot:
         xlim_min=0.8,
         xlim_max=4.0,
         xdiff_nens=0.3,
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     # Save

scripts/errorplot/runplot_figure_8_d.ipy

@@ -63,6 +63,7 @@ if is_plot:
         xlim_min=0.8,
         xlim_max=4.0,
         xdiff_nens=0.3,
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     # Save

scripts/errorplot/runplot_figure_9_a.ipy

@@ -10,7 +10,7 @@ import pskf.tools.run.pythonmodule as pm
 # Switches
 is_read = 1
 is_plot = 1
-is_save = 1
+is_save = 0
 is_show = 1
 is_backup = 0
 
@@ -61,6 +61,7 @@ if is_plot:
         xlim_min=0.8,
         xlim_max=4.0,
         xdiff_nens=0.3,
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     # Save

scripts/errorplot/runplot_figure_9_b.ipy

@@ -10,7 +10,7 @@ import pskf.tools.run.pythonmodule as pm
 # Switches
 is_read = 1
 is_plot = 1
-is_save = 1
+is_save = 0
 is_show = 1
 is_backup = 0
 
@@ -63,6 +63,7 @@ if is_plot:
         xlim_min=0.8,
         xlim_max=4.0,
         xdiff_nens=0.3,
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     # Save

scripts/errorplot/runplot_pp_figure_10_a.ipy

@@ -1,3 +1,5 @@
+# REMOVED from paper
+
 import numpy as np
 import matplotlib.pyplot as plt
 
@@ -20,7 +22,7 @@ is_backup = 0
 model_name = 'wavereal'
 
 # Correct corr
-which_methods = [1912, 6, 8]
+which_methods = [1912, 6, 19]
 
 ensemble_sizes = [50, 70, 100, 250]
 

scripts/errorplot/runplot_pp_figure_10_b.ipy

@@ -1,3 +1,5 @@
+# REMOVED from paper
+
 import numpy as np
 import matplotlib.pyplot as plt
 
@@ -20,7 +22,7 @@ is_backup = 0
 model_name = 'wavewell'
 
 # Correct corr
-which_methods = [1912, 6, 8]
+which_methods = [1912, 6, 19]
 
 ensemble_sizes = [50, 70, 100, 250]
 

scripts/errorplot/runplot_pp_figure_2_a.ipy

@@ -100,7 +100,7 @@ if is_plot:
         which_res=which_res,
         ensemble_sizes=ensemble_sizes,
         axistitle=model_name.upper(),
-        ylims=[0.29, 0.42],
+        ylims=[0.29, 0.4199],
         xlim_max=11,
         yticks=np.arange(0.3, 0.5, 0.02),
         fontleg=20,
@@ -117,7 +117,8 @@ if is_plot:
         text_x=1.0,
         text_y=0.39,
         coleros=coleros,
-        markersize=[(10 if not i == 3 else 10) for i in range(32)]
+        markersize=[(10 if not i == 3 else 10) for i in range(32)],
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     # Save

scripts/errorplot/runplot_pp_figure_2_b.ipy

@@ -1,3 +1,4 @@
+import os
 import numpy as np
 import matplotlib.pyplot as plt
 
@@ -104,7 +105,7 @@ if is_plot:
         ensemble_sizes=ensemble_sizes,
         axistitle=model_name.upper(),
         lineyval=0.76,
-        ylims=[0.53, 1.0],
+        ylims=[0.53, 0.999],
         xlim_max=11,
         yticks=np.arange(0.55, 1.00, 0.05),
         fontleg=20,
@@ -123,7 +124,8 @@ if is_plot:
         text_y=0.891538461539,
         formatsos=formatsos,
         coleros=coleros,
-        markersize=[(10 if not i == 3 else 10) for i in range(32)]
+        markersize=[(10 if not i == 3 else 10) for i in range(32)],
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     # Save

scripts/errorplot/runplot_pp_figure_5_a.ipy

@@ -1,3 +1,4 @@
+import os
 import numpy as np
 import matplotlib.pyplot as plt
 
@@ -119,11 +120,11 @@ if is_plot:
         text_y=0.42,
         coleros=coleros,
         markersize=[(10 if not i == 3 else 10) for i in range(32)],
-        ylabel=r'STD  $\log(K[\mathrm{m}^2])$',
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     plt.hlines(
-        np.mean(np.load("/home/jk125262/pyshemkf/output/dists/npy/"
+        np.mean(np.load(os.environ["HOME"]+"/pyshemkf/output/dists/npy/"
                         + "endstd_"
                         + model_name
                         + "_2019_03_10_b.npy")),

scripts/errorplot/runplot_pp_figure_5_b.ipy

@@ -1,3 +1,4 @@
+import os
 import numpy as np
 import matplotlib.pyplot as plt
 
@@ -125,11 +126,11 @@ if is_plot:
         formatsos=formatsos,
         coleros=coleros,
         markersize=[(10 if not i == 3 else 10) for i in range(32)],
-        ylabel=r'STD  $\log(K[\mathrm{m}^2])$',
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     plt.hlines(
-        np.mean(np.load("/home/j.keller/SHEMAT/pyshemkf/output/dists/npy/"
+        np.mean(np.load(os.environ["HOME"]+"/pyshemkf/output/dists/npy/"
                         + "endstd_"
                         + model_name
                         + "_2019_03_10_b.npy")),

scripts/errorplot/runplot_pp_figure_6_a.ipy

@@ -104,7 +104,7 @@ if is_plot:
         which_res=which_res,
         ensemble_sizes=ensemble_sizes,
         axistitle=model_name.upper(),
-        ylims=[0.29, 0.42],
+        ylims=[0.29, 0.4199],
         xlim_max=11,
         yticks=np.arange(0.3, 0.42, 0.02),
         fontleg=20,
@@ -122,7 +122,8 @@ if is_plot:
         text_y=0.39,
         formatsos=formatsos,
         coleros=coleros,
-        markersize=[(10 if not i == 3 else 10) for i in range(32)]
+        markersize=[(10 if not i == 3 else 10) for i in range(32)],
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     # Save

scripts/errorplot/runplot_pp_figure_6_b.ipy

@@ -104,7 +104,7 @@ if is_plot:
         which_res=which_res,
         ensemble_sizes=ensemble_sizes,
         axistitle=model_name.upper(),
-        ylims=[0.29, 0.42],
+        ylims=[0.29, 0.4199],
         xlim_max=11,
         yticks=np.arange(0.3, 0.42, 0.02),
         fontleg=20,
@@ -122,7 +122,8 @@ if is_plot:
         text_y=0.39,
         formatsos=formatsos,
         coleros=coleros,
-        markersize=[(10 if not i == 3 else 10) for i in range(32)]
+        markersize=[(10 if not i == 3 else 10) for i in range(32)],
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     # Save

scripts/errorplot/runplot_pp_figure_7_a.ipy

@@ -105,7 +105,7 @@ if is_plot:
         ensemble_sizes=ensemble_sizes,
         axistitle=model_name.upper(),
         lineyval=0.76,
-        ylims=[0.53, 1.0],
+        ylims=[0.53, 0.999],
         xlim_max=11,
         yticks=np.arange(0.55, 1.00, 0.05),
         fontleg=20,
@@ -124,7 +124,8 @@ if is_plot:
         text_y=0.891538461539,
         formatsos=formatsos,
         coleros=coleros,
-        markersize=[(10 if not i == 3 else 10) for i in range(32)]
+        markersize=[(10 if not i == 3 else 10) for i in range(32)],
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     # Save

scripts/errorplot/runplot_pp_figure_7_b.ipy

@@ -105,7 +105,7 @@ if is_plot:
         ensemble_sizes=ensemble_sizes,
         axistitle=model_name.upper(),
         lineyval=0.76,
-        ylims=[0.53, 1.0],
+        ylims=[0.53, 0.999],
         xlim_max=11,
         yticks=np.arange(0.55, 1.00, 0.05),
         fontleg=20,
@@ -124,7 +124,8 @@ if is_plot:
         text_y=0.891538461539,
         formatsos=formatsos,
         coleros=coleros,
-        markersize=[(10 if not i == 3 else 10) for i in range(32)]
+        markersize=[(10 if not i == 3 else 10) for i in range(32)],
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$'
     )
 
     # Save

scripts/errorplot/runplot_pp_figure_8_a.ipy

@@ -20,7 +20,7 @@ is_backup = 0
 model_name = 'wavereal'
 
 # Correct corr
-which_methods = [1921, 1922, 8, 1923, 1924]
+which_methods = [1921, 1922, 19, 1923, 1924]
 
 ensemble_sizes = [50, 70, 100, 250]
 
@@ -67,8 +67,8 @@ coleros = [(0.90, 0.90, 0.90), (0.90, 0.90, 0.90), (0.9, 0.9, 0.9),
 
 pp_find_array = [
     x or y for (x, y) in zip(
-        np.array(which_methods_sorted) == 7,
-        np.array(which_methods_sorted) > 1700)
+        np.array(which_methods_sorted) == 19,
+        np.array(which_methods_sorted) > 2000)
 ]
 pp_index = np.where(pp_find_array)[0][0]
 coleros[pp_index] = (0.0, 0.0, 0.0)
@@ -86,16 +86,17 @@ if is_plot:
         which_methods=which_methods_sorted,
         ensemble_sizes=ensemble_sizes,
         axistitle=model_name.upper(),
-        ylims=[0.29, 0.42],
-        xlim_max=11,
+        ylims=[0.29, 0.41999],
+        xlim_max=8,
         yticks=np.arange(0.3, 0.5, 0.02),
         fontleg=20,
         legend_input=None,
         is_text=True,
         text_x=1.0,
         text_y=0.39,
         coleros=coleros,
-        markersize=[(10 if not i == 3 else 10) for i in range(32)])
+        markersize=[(10 if not i == 3 else 10) for i in range(32)],
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$')
 
     # Save
     if is_save:

scripts/errorplot/runplot_pp_figure_8_b.ipy

@@ -20,7 +20,7 @@ is_backup = 0
 model_name = 'wavewell'
 
 # Correct corr
-which_methods = [8, 1925, 1926]
+which_methods = [19, 1925, 1926]
 
 ensemble_sizes = [50, 70, 100, 250]
 
@@ -67,8 +67,8 @@ coleros = [(0.90, 0.90, 0.90), (0.90, 0.90, 0.90), (0.9, 0.9, 0.9),
 
 pp_find_array = [
     x or y for (x, y) in zip(
-        np.array(which_methods_sorted) == 7,
-        np.array(which_methods_sorted) > 1700)
+        np.array(which_methods_sorted) == 19,
+        np.array(which_methods_sorted) > 2000)
 ]
 pp_index = np.where(pp_find_array)[0][0]
 coleros[pp_index] = (0.0, 0.0, 0.0)
@@ -87,16 +87,17 @@ if is_plot:
         ensemble_sizes=ensemble_sizes,
         axistitle=model_name.upper(),
         lineyval=0.76,
-        ylims=[0.53, 1.0],
-        xlim_max=11,
+        ylims=[0.53, 0.999],
+        xlim_max=6,
         yticks=np.arange(0.55, 1.05, 0.05),
         fontleg=20,
         legend_input=None,
         is_text=True,
         text_x=1.0,
         text_y=0.891538461539,
         coleros=coleros,
-        markersize=[(10 if not i == 3 else 10) for i in range(32)])
+        markersize=[(10 if not i == 3 else 10) for i in range(32)],
+        ylabel=r'RMSE  $\log_{10}(K/\mathrm{m}^2)$')
 
     # Save
     if is_save:

scripts/errorplot/runplot_pp_figure_9_a.ipy

@@ -1,3 +1,5 @@
+# REMOVED from paper
+
 import numpy as np
 import matplotlib.pyplot as plt
 
@@ -20,7 +22,7 @@ is_backup = 0
 model_name = 'wavereal'
 
 # Correct corr
-which_methods = [1911, 1, 8]
+which_methods = [1911, 1, 19]
 
 ensemble_sizes = [50, 70, 100, 250]