Adhering to python standards for naming classes

Author: Thomas Baumann

pySDC/core/Controller.py

@@ -6,7 +6,7 @@
 from pySDC.core.BaseTransfer import base_transfer
 from pySDC.helpers.pysdc_helper import FrozenClass
 from pySDC.implementations.convergence_controller_classes.check_convergence import CheckConvergence
-from pySDC.implementations.hooks.default_hook import default_hooks
+from pySDC.implementations.hooks.default_hook import DefaultHooks
 
 
 # short helper class to add params as attributes
@@ -42,7 +42,7 @@ def __init__(self, controller_params, description):
 
         # check if we have a hook on this list. If not, use default class.
         self.__hooks = []
-        hook_classes = [default_hooks]
+        hook_classes = [DefaultHooks]
         user_hooks = controller_params.get('hook_class', [])
         hook_classes += user_hooks if type(user_hooks) == list else [user_hooks]
         [self.add_hook(hook) for hook in hook_classes]

pySDC/implementations/convergence_controller_classes/estimate_embedded_error.py

@@ -2,7 +2,7 @@
 
 from pySDC.core.ConvergenceController import ConvergenceController, Pars
 from pySDC.implementations.convergence_controller_classes.store_uold import StoreUOld
-from pySDC.implementations.hooks.log_embedded_error_estimate import log_embedded_error_estimate
+from pySDC.implementations.hooks.log_embedded_error_estimate import LogEmbeddedErrorEstimate
 
 from pySDC.implementations.sweeper_classes.Runge_Kutta import RungeKutta
 
@@ -26,7 +26,7 @@ def __init__(self, controller, params, description, **kwargs):
         """
         super(EstimateEmbeddedError, self).__init__(controller, params, description, **kwargs)
         self.buffers = Pars({'e_em_last': 0.0})
-        controller.add_hook(log_embedded_error_estimate)
+        controller.add_hook(LogEmbeddedErrorEstimate)
 
     @classmethod
     def get_implementation(cls, flavor):

pySDC/implementations/convergence_controller_classes/estimate_extrapolation_error.py

@@ -4,7 +4,7 @@
 from pySDC.core.ConvergenceController import ConvergenceController, Status
 from pySDC.core.Errors import DataError
 from pySDC.implementations.datatype_classes.mesh import mesh, imex_mesh
-from pySDC.implementations.hooks.log_extrapolated_error_estimate import log_extrapolated_error_estimate
+from pySDC.implementations.hooks.log_extrapolated_error_estimate import LogExtrapolationErrorEstimate
 
 
 class EstimateExtrapolationErrorBase(ConvergenceController):
@@ -28,7 +28,7 @@ def __init__(self, controller, params, description, **kwargs):
         self.prev = Status(["t", "u", "f", "dt"])  # store solutions etc. of previous steps here
         self.coeff = Status(["u", "f", "prefactor"])  # store coefficients for extrapolation here
         super(EstimateExtrapolationErrorBase, self).__init__(controller, params, description)
-        controller.add_hook(log_extrapolated_error_estimate)
+        controller.add_hook(LogExtrapolationErrorEstimate)
 
     def setup(self, controller, params, description, **kwargs):
         """
@@ -254,7 +254,7 @@ class EstimateExtrapolationErrorNonMPI(EstimateExtrapolationErrorBase):
 
     def setup(self, controller, params, description, **kwargs):
         """
-        Add a no parameter 'no_storage' which decides whether the standart or the no-memory-overhead version is run,
+        Add a no parameter 'no_storage' which decides whether the standard or the no-memory-overhead version is run,
         where only values are used for extrapolation which are in memory of other processes
 
         Args:

pySDC/implementations/hooks/default_hook.py

@@ -2,7 +2,7 @@
 from pySDC.core.Hooks import hooks
 
 
-class default_hooks(hooks):
+class DefaultHooks(hooks):
     """
     Hook class to contain the functions called during the controller runs (e.g. for calling user-routines)
 
@@ -27,7 +27,7 @@ class default_hooks(hooks):
     """
 
     def __init__(self):
-        super(default_hooks, self).__init__()
+        super(DefaultHooks, self).__init__()
         self.__t0_setup = None
         self.__t0_run = None
         self.__t0_predict = None

pySDC/projects/Resilience/hook.py

@@ -1,10 +1,10 @@
 from pySDC.core.Hooks import hooks
-from pySDC.implementations.hooks.log_solution import log_solution
-from pySDC.implementations.hooks.log_embedded_error_estimate import log_embedded_error_estimate
-from pySDC.implementations.hooks.log_extrapolated_error_estimate import log_extrapolated_error_estimate
+from pySDC.implementations.hooks.log_solution import LogSolution
+from pySDC.implementations.hooks.log_embedded_error_estimate import LogEmbeddedErrorEstimate
+from pySDC.implementations.hooks.log_extrapolated_error_estimate import LogExtrapolationErrorEstimate
 
 
-hook_collection = [log_solution, log_embedded_error_estimate, log_extrapolated_error_estimate]
+hook_collection = [LogSolution, LogEmbeddedErrorEstimate, LogExtrapolationErrorEstimate]
 
 
 class log_data(hooks):

pySDC/projects/Resilience/vdp.py

@@ -8,8 +8,7 @@
 from pySDC.implementations.controller_classes.controller_nonMPI import controller_nonMPI
 from pySDC.implementations.convergence_controller_classes.adaptivity import Adaptivity
 from pySDC.core.Errors import ProblemError
-from pySDC.projects.Resilience.hook import log_data
-from pySDC.implementations.hooks.log_solution import log_solution
+from pySDC.projects.Resilience.hook import log_data, hook_collection
 
 
 def plot_step_sizes(stats, ax):
@@ -29,7 +28,7 @@ def plot_step_sizes(stats, ax):
     p = np.array([me[1][1] for me in get_sorted(stats, type='u', recomputed=False, sortby='time')])
     t = np.array([me[0] for me in get_sorted(stats, type='u', recomputed=False, sortby='time')])
 
-    e_em = np.array(get_sorted(stats, type='e_embedded', recomputed=False, sortby='time'))[:, 1]
+    e_em = np.array(get_sorted(stats, type='error_embedded_estimate', recomputed=False, sortby='time'))[:, 1]
     dt = np.array(get_sorted(stats, type='dt', recomputed=False, sortby='time'))
     restart = np.array(get_sorted(stats, type='restart', recomputed=None, sortby='time'))
 
@@ -139,7 +138,7 @@ def run_vdp(
     # initialize controller parameters
     controller_params = dict()
     controller_params['logger_level'] = 30
-    controller_params['hook_class'] = [hook_class, log_solution]
+    controller_params['hook_class'] = hook_collection + [hook_class]
     controller_params['mssdc_jac'] = False
 
     if custom_controller_params is not None: