More plotting

Author: brownbaerchen

pySDC/projects/RayleighBenard/analysis_scripts/RBC3D_order.py

@@ -10,7 +10,6 @@
 from pySDC.projects.RayleighBenard.analysis_scripts.plotting_utils import get_plotting_style, savefig
 
 step_sizes = {
-    'RBC3DG4R4Ra1e5': [8e-2, 4e-2, 2e-2, 1e-2, 5e-3],
     'RBC3DG4R4SDC23Ra1e5': [5e-3 * 2**i for i in range(8)],
     'RBC3DG4R4SDC34Ra1e5': [5e-3 * 2**i for i in range(8)],
     'RBC3DG4R4SDC44Ra1e5': [5e-3 * 2**i for i in range(8)],
@@ -74,7 +73,7 @@ def plot_error_all_components(args):  # pragma: no cover
 def compare_order(Ra):  # pragma: no cover
     fig, ax = plt.subplots(figsize=figsize_by_journal('Nature_CS', 1, 0.6))
     if Ra == 1e5:
-        names = ['RK', 'Euler', 'SDC23', 'SDC34', 'SDC44'][::-1]
+        names = ['RK', 'Euler', 'SDC22', 'SDC23', 'SDC34', 'SDC44'][::-1]
         configs = [f'RBC3DG4R4{me}Ra1e5' for me in names]
         paths = [f'./data/RBC3DG4R4{me}Ra1e5-res-1-order.pickle' for me in names]
 
@@ -92,7 +91,7 @@ def compare_order(Ra):  # pragma: no cover
         ax.loglog(dt, e, **get_plotting_style(config))
 
     for _dt in dt:
-        for i in [1, 3, 4]:
+        for i in [1, 2, 3, 4]:
             ax.text(_dt, _dt**i, i, fontweight='bold', fontsize=14, ha='center', va='center')
             ax.loglog(dt, dt**i, ls=':', color='black')
 

pySDC/projects/RayleighBenard/analysis_scripts/plot_Nu.py

@@ -39,9 +39,9 @@ def plot_Nu(res, dts, config_name, ref, ax, title):  # pragma: no cover
         if any(error > 1e-2):
             deviates = min(t_i[error > 1e-2])
             ax.axvline(deviates, color=last_line.get_color(), ls=':')
-            print(f'{title} dt={dt} Nu={Nu_mean:.3f}+={Nu_std:.3f}, deviates more than 1% from t={deviates:.2f}')
+            print(f'{title} dt={dt:.4f} Nu={Nu_mean:.3f}+={Nu_std:.3f}, deviates more than 1% from t={deviates:.2f}')
         else:
-            print(f'{title} dt={dt} Nu={Nu_mean:.3f}+={Nu_std:.3f}')
+            print(f'{title} dt={dt:.4f} Nu={Nu_mean:.3f}+={Nu_std:.3f}')
         ax.legend(frameon=True, loc='upper left')
 
 
@@ -50,12 +50,13 @@ def plot_Nu_over_time_Ra1e5():  # pragma: no cover
 
     res = 32
 
-    ref_data = get_pySDC_data(res=res, dt=0.01, config_name='RBC3DG4R4Ra1e5')
+    ref_data = get_pySDC_data(res=res, dt=0.01, config_name='RBC3DG4R4SDC44Ra1e5')
 
     plot_Nu(32, [0.06, 0.04, 0.02], 'RBC3DG4R4SDC34Ra1e5', ref_data, Nu_axs[0], 'SDC34')
     plot_Nu(32, [0.06, 0.05, 0.02, 0.01], 'RBC3DG4R4SDC23Ra1e5', ref_data, Nu_axs[1], 'SDC23')
     plot_Nu(32, [0.05, 0.04, 0.02, 0.01, 0.005], 'RBC3DG4R4RKRa1e5', ref_data, Nu_axs[2], 'RK443')
     plot_Nu(32, [0.02, 0.01, 0.005], 'RBC3DG4R4EulerRa1e5', ref_data, Nu_axs[3], 'RK111')
+    plot_Nu(32, [0.04, 0.02], 'RBC3DG4R4SDC22Ra1e5', ref_data, Nu_axs[3], 'SDC22')
 
     Nu_axs[-1].set_xlabel('$t$')
     Nu_axs[-1].set_ylabel('$Nu$')

pySDC/projects/RayleighBenard/analysis_scripts/plotting_utils.py

@@ -1,5 +1,6 @@
 from pySDC.helpers.plot_helper import figsize_by_journal, setup_mpl
 import warnings
+import os
 
 setup_mpl()
 
@@ -8,7 +9,12 @@ def get_plotting_style(config):  # pragma: no cover
 
     args = {'color': None, 'ls': None, 'marker': None, 'markersize': 6, 'label': None}
 
-    if config == 'RBC3DG4R4SDC23Ra1e5':
+    if config == 'RBC3DG4R4SDC22Ra1e5':
+        args['color'] = 'tab:brown'
+        args['ls'] = '-'
+        args['marker'] = '3'
+        args['label'] = 'SDC22'
+    elif config == 'RBC3DG4R4SDC23Ra1e5':
         args['color'] = 'tab:blue'
         args['ls'] = '-'
         args['marker'] = 'o'
@@ -18,7 +24,7 @@ def get_plotting_style(config):  # pragma: no cover
         args['ls'] = '-'
         args['marker'] = '<'
         args['label'] = 'SDC34'
-    elif config in ['RBC3DG4R4SDC44Ra1e5', 'RBC3DG4R4Ra1e5']:
+    elif config == 'RBC3DG4R4SDC44Ra1e5':
         args['color'] = 'tab:green'
         args['ls'] = '-'
         args['marker'] = 'x'
@@ -40,6 +46,8 @@ def get_plotting_style(config):  # pragma: no cover
 
 
 def savefig(fig, name, format='pdf', base_path='./plots', **kwargs):  # pragma: no cover
+    os.makedirs(base_path, exist_ok=True)
+
     path = f'{base_path}/{name}.{format}'
     fig.savefig(path, bbox_inches='tight', **kwargs)
     print(f'Saved figure {path!r}')

pySDC/projects/RayleighBenard/run_experiment.py

@@ -15,8 +15,8 @@ def str_to_procs(me):
         '--mode',
         type=str,
         help='Mode for this script',
-        default='run',
-        choices=['run'],
+        default=None,
+        choices=['run', 'plot'],
     )
     parser.add_argument('--config', type=str, help='Configuration to load', default=None)
     parser.add_argument('--restart_idx', type=int, help='Restart from file by index', default=0)