TL: solved formating and merge problems

Author: tlunet

pySDC/helpers/fieldsIO.py

@@ -518,7 +518,7 @@ def setupMPI(cls, comm: MPI.Intracomm, iLoc, nLoc):
         cls.comm = comm
         cls.iLoc = iLoc
         cls.nLoc = nLoc
-        cls.mpiFile:MPI.File = None
+        cls.mpiFile: MPI.File = None
 
     @property
     def MPI_ON(self):

pySDC/projects/Resilience/GS.py

@@ -54,14 +54,9 @@ def u_exact(self, t, u_init=None, t_init=None, recompute=False, _t0=None):
     return data
 
 
-<<<<<<< HEAD
-grayscott_imex_diffusion._u_exact = grayscott_imex_diffusion.u_exact
-grayscott_imex_diffusion.u_exact = u_exact
-=======
 if not hasattr(grayscott_imex_diffusion, '_u_exact'):
     grayscott_imex_diffusion._u_exact = grayscott_imex_diffusion.u_exact
     grayscott_imex_diffusion.u_exact = u_exact
->>>>>>> master
 
 
 def run_GS(

pySDC/projects/Resilience/RBC.py

@@ -296,11 +296,7 @@ def plot_step_size(t0=0, Tend=30, e_tol=1e-3, recompute=False):  # pragma: no co
     plt.show()
 
 
-<<<<<<< HEAD
-def plot_factorizations_over_time(t0=0, Tend=50, e_tol=1e-3, recompute=False, adaptivity_mode='dt'):
-=======
 def plot_factorizations_over_time(t0=0, Tend=50, e_tol=1e-3, recompute=False, adaptivity_mode='dt'):  # pragma: no cover
->>>>>>> master
     import matplotlib.pyplot as plt
     import pickle
     import os

pySDC/projects/Resilience/paper_plots.py

@@ -906,73 +906,6 @@ def make_plots_for_thesis():  # pragma: no cover
         plot_RBC_solution(setup)
 
     from pySDC.projects.Resilience.RBC import plot_factorizations_over_time
-<<<<<<< HEAD
-
-    plot_factorizations_over_time(t0=0, Tend=50)
-
-    from pySDC.projects.Resilience.work_precision import (
-        all_problems,
-    )
-
-    all_params = {
-        'record': False,
-        'work_key': 't',
-        'precision_key': 'e_global_rel',
-        'plotting': True,
-        'base_path': 'data/paper',
-        'target': 'thesis',
-    }
-
-    for mode in ['compare_strategies', 'parallel_efficiency_dt_k', 'parallel_efficiency_dt', 'RK_comp']:
-        all_problems(**all_params, mode=mode)
-    all_problems(**{**all_params, 'work_key': 'param'}, mode='compare_strategies')
-
-    for tend in [500, 2000]:
-        plot_GS_solution(tend=tend)
-    for setup in ['resilience', 'adaptivity']:
-        plot_vdp_solution(setup=setup)
-
-    plot_adaptivity_stuff()
-
-    plot_fault_Lorenz(0)
-    plot_fault_Lorenz(20)
-    compare_recovery_rate_problems(target='thesis', num_procs=1, strategy_type='SDC')
-    plot_recovery_rate_per_acceptance_threshold(run_Lorenz)
-    plot_recovery_rate(get_stats(run_Lorenz))
-    plot_recovery_rate_detailed_Lorenz()
-
-
-def make_plots_for_TUHH_seminar():  # pragma: no cover
-    global JOURNAL
-    JOURNAL = 'JSC_beamer'
-
-    from pySDC.projects.Resilience.work_precision import (
-        all_problems,
-    )
-
-    all_params = {
-        'record': False,
-        'work_key': 't',
-        'precision_key': 'e_global_rel',
-        'plotting': True,
-        'base_path': 'data/paper',
-        'target': 'talk',
-    }
-
-    for mode in ['compare_strategies', 'parallel_efficiency_dt_k', 'parallel_efficiency_dt', 'RK_comp']:
-        all_problems(**all_params, mode=mode)
-    all_problems(**{**all_params, 'work_key': 'param'}, mode='compare_strategies')
-
-    # plot_GS_solution()
-    # for setup in ['resilience_thesis', 'work_precision']:
-    #     plot_RBC_solution(setup)
-    # for setup in ['resilience', 'adaptivity']:
-    #     plot_vdp_solution(setup=setup)
-
-    # plot_adaptivity_stuff()
-
-    # plot_fault_Lorenz(20, target='talk')
-=======
 
     plot_factorizations_over_time(t0=0, Tend=50)
 
@@ -1037,7 +970,6 @@ def make_plots_for_TUHH_seminar():  # pragma: no cover
     plot_adaptivity_stuff()
 
     plot_fault_Lorenz(20, target='talk')
->>>>>>> master
     compare_recovery_rate_problems(target='talk', num_procs=1, strategy_type='SDC')
     plot_recovery_rate_per_acceptance_threshold(run_Lorenz, target='talk')
     plot_recovery_rate_detailed_Lorenz(target='talk')

pySDC/projects/Resilience/work_precision.py

@@ -297,10 +297,6 @@ def record_work_precision(
                 exponents = [-3, -2, -1, 0, 0.2, 0.8, 1][::-1]
         if problem.__name__ == 'run_RBC':
             exponents = [1, 0, -0.5, -1, -2]
-<<<<<<< HEAD
-            # exponents = [3, 2, 1, 0]
-=======
->>>>>>> master
         if problem.__name__ == 'run_GS':
             exponents = [-2, -1, 0, 1, 2, 3][::-1]
         if problem.__name__ == 'run_Lorenz':
@@ -989,8 +985,6 @@ def get_configs(mode, problem):
                 'num_procs': num_procs_dt,
                 'plotting_params': {'label': rf'$\Delta t$-adaptivity $N$={num_procs_dt}x1', 'ls': ls[num_procs_dt]},
             }
-<<<<<<< HEAD
-=======
 
     elif mode == 'RK_comp_high_order_RBC':
         """
@@ -1057,7 +1051,6 @@ def get_configs(mode, problem):
             'num_procs': num_procs_dt,
             'plotting_params': {'label': rf'$\Delta t$-adaptivity $N$={num_procs_dt}x1', 'ls': ls[num_procs_dt]},
         }
->>>>>>> master
 
     elif mode == 'parallel_efficiency':
         """