diff --git a/Initial_Condition.py b/Initial_Condition.py index c76d6845996582d253083c51a746e85ed3986fc8..d154f70938e4c06c641397f9bdaf9c5b590f0120 100644 --- a/Initial_Condition.py +++ b/Initial_Condition.py @@ -2,7 +2,7 @@ """ @author: Laura C. Kühle -TODO: Rename initial conditions -> Renamed returned names +TODO: Rename initial conditions -> Done """ import numpy as np @@ -31,7 +31,7 @@ class InitialCondition(object): pass -class InitialCondition1(InitialCondition): +class Sine(InitialCondition): def __init__(self, left_bound, right_bound, config): super().__init__(left_bound, right_bound, config) # Set name of function @@ -44,7 +44,7 @@ class InitialCondition1(InitialCondition): return np.sin(self.factor * np.pi * x) -class InitialCondition2(InitialCondition): +class Box(InitialCondition): def __init__(self, left_bound, right_bound, config): super().__init__(left_bound, right_bound, config) # Set name of function @@ -62,12 +62,12 @@ class InitialCondition2(InitialCondition): return 0 -class InitialCondition3(InitialCondition): +class FourPeakWave(InitialCondition): def __init__(self, left_bound, right_bound, config): super().__init__(left_bound, right_bound, config) # Set name of function - self.function_name = 'FourMixedTypes' + self.function_name = 'FourPeakWave' self.alpha = 10 self.delta = 0.005 @@ -98,7 +98,7 @@ class InitialCondition3(InitialCondition): return np.sqrt(max(1 - self.alpha**2 * (x-a)**2, 0)) -class InitialCondition4(InitialCondition): +class Linear(InitialCondition): def __init__(self, left_bound, right_bound, config): super().__init__(left_bound, right_bound, config) @@ -112,7 +112,7 @@ class InitialCondition4(InitialCondition): return self.factor * x -class InitialCondition5(InitialCondition): +class LinearAbsolut(InitialCondition): def __init__(self, left_bound, right_bound, config): super().__init__(left_bound, right_bound, config) @@ -126,12 +126,12 @@ class InitialCondition5(InitialCondition): return self.factor * abs(x) -class InitialCondition6(InitialCondition): +class DiscontinuousConstant(InitialCondition): def __init__(self, left_bound, right_bound, config): super().__init__(left_bound, right_bound, config) # Set name of function - self.function_name = 'ConstantWithDiscontinuity' + self.function_name = 'DiscontinuousConstant' self.x0 = config.pop('x0', 0) self.left_factor = config.pop('left_factor', 1)