diff --git a/DG_Approximation.py b/DG_Approximation.py index b31aa5218ace8af33c000263ad08b5f3f06bc0f6..1ea2ea30a962be4fc2e0b2ef68a77f35dbbfee27 100644 --- a/DG_Approximation.py +++ b/DG_Approximation.py @@ -91,15 +91,15 @@ class DGScheme(object): # Replace the string names with the actual class instances # (and add the instance variables for the quadrature) - self._init_cond = getattr(Initial_Condition, self._init_cond)(self._left_bound, self._right_bound, self._init_config) + self._init_cond = getattr(Initial_Condition, self._init_cond)(self._left_bound, self._right_bound, + self._init_config) self._limiter = getattr(Limiter, self._limiter)(self._limiter_config) self._quadrature = getattr(Quadrature, self._quadrature)(self._quadrature_config) self._detector = getattr(Troubled_Cell_Detector, self._detector)( self._detector_config, self._mesh, self._wave_speed, self._polynom_degree, self._num_grid_cells, self._final_time, self._left_bound, self._right_bound, self._basis, self._init_cond, self._quadrature) - self._update_scheme = getattr(Update_Scheme, self._update_scheme)( - self._detector, self._limiter, self._init_cond, self._mesh, self._wave_speed, self._polynom_degree, - self._num_grid_cells, self._final_time, self._history_threshold, self._left_bound, self._right_bound) + self._update_scheme = getattr(Update_Scheme, self._update_scheme)(self._polynom_degree, self._num_grid_cells, + self._detector, self._limiter) # print(self._detector.get_name()) # print(self._detector.__class__.__name__) diff --git a/Limiter.py b/Limiter.py index bedb510b0bbc06b311de3e317e71e7214ed98ee9..3b05aa9520700caf4d1d3fad4bc580c8d8fece76 100644 --- a/Limiter.py +++ b/Limiter.py @@ -78,8 +78,6 @@ class ModifiedMinMod(MinMod): # Set name of function self.function_name = 'ModifiedMinMod' + str(self._erase_degree) - self._cell = 0 - def _determine_modification(self, projection, cell, cell_slope): if abs(cell_slope) <= self._mod_factor*self._cell_len**2: return True diff --git a/Update_Scheme.py b/Update_Scheme.py index 599550e7e2e45dc384b768a91a2412f8fd2342e4..67dedf016794fa69e38e3d11dc0d69f3778f5331 100644 --- a/Update_Scheme.py +++ b/Update_Scheme.py @@ -17,20 +17,12 @@ import timeit class UpdateScheme(object): - def __init__(self, detector, limiter, init_cond, mesh, wave_speed, polynom_degree, num_grid_cells, final_time, - history_threshold, left_bound, right_bound): + def __init__(self, polynom_degree, num_grid_cells, detector, limiter): # Unpack positional arguments - self._detector = detector - self._limiter = limiter - self._init_cond = init_cond - self._mesh = mesh - self._wave_speed = wave_speed self._polynom_degree = polynom_degree self._num_grid_cells = num_grid_cells - self._final_time = final_time - self._history_threshold = history_threshold - self._left_bound = left_bound - self._right_bound = right_bound + self._detector = detector + self._limiter = limiter self._reset() @@ -48,8 +40,6 @@ class UpdateScheme(object): def _reset(self): # Set additional necessary fixed instance variables self.name = 'None' - self._interval_len = self._right_bound-self._left_bound - self._cell_len = self._interval_len / self._num_grid_cells # Set matrix A matrix = [] @@ -89,10 +79,8 @@ class UpdateScheme(object): class SSPRK3(UpdateScheme): - def __init__(self, detector, limiter, init_cond, mesh, wave_speed, polynom_degree, num_grid_cells, final_time, - history_threshold, left_bound, right_bound): - super().__init__(detector, limiter, init_cond, mesh, wave_speed, polynom_degree, num_grid_cells, final_time, - history_threshold, left_bound, right_bound) + def __init__(self, polynom_degree, num_grid_cells, detector, limiter): + super().__init__(polynom_degree, num_grid_cells, detector, limiter) # Set name of update scheme self.name = 'SSPRK3'