fix forced timestep update

hysop/backend/device/opencl/operator/spatial_filtering.py

@@ -7,12 +7,20 @@ from hysop.core.graph.graph import op_apply
 from hysop.fields.continuous_field import Field
 from hysop.parameters.parameter import Parameter
 from hysop.topology.cartesian_descriptor import CartesianTopologyDescriptors
-from hysop.operator.base.spatial_filtering import RemeshLowpassFilterBase, SpectralLowpassFilterBase
+from hysop.operator.base.spatial_filtering import RemeshLowpassFilterBase, SpectralLowpassFilterBase, SubgridLowpassFilterBase
 from hysop.backend.device.opencl.opencl_copy_kernel_launchers import OpenClCopyBufferRectLauncher
 from hysop.backend.device.opencl.opencl_kernel_launcher import OpenClKernelListLauncher
 from hysop.backend.device.opencl.opencl_elementwise import OpenClElementwiseKernelGenerator
 from hysop.symbolic.relational import Assignment
 
+class OpenClSubgridLowpassFilter(SubgridLowpassFilterBase, OpenClOperator):
+    """
+    OpenCL implementation for lowpass spatial filtering: small grid -> coarse grid
+    using the subgrid method.
+    """
+    pass
+
+
 class OpenClSpectralLowpassFilter(SpectralLowpassFilterBase, OpenClOperator):
     """
     OpenCL implementation for lowpass spatial filtering: small grid -> coarse grid

hysop/operator/spatial_filtering.py

@@ -30,7 +30,7 @@ class LowpassFilterFrontend(MultiComputationalGraphNodeFrontend):
         from hysop.backend.host.python.operator.spatial_filtering import \
             PythonRemeshLowpassFilter, PythonSpectralLowpassFilter, PythonSubgridLowpassFilter
         from hysop.backend.device.opencl.operator.spatial_filtering import \
-            OpenClSpectralLowpassFilter
+            OpenClSpectralLowpassFilter, OpenClSubgridLowpassFilter
         ai = {
                 FilteringMethod.SPECTRAL: {
                     Implementation.PYTHON: PythonSpectralLowpassFilter,
@@ -40,7 +40,8 @@ class LowpassFilterFrontend(MultiComputationalGraphNodeFrontend):
                     Implementation.PYTHON: PythonRemeshLowpassFilter
                 },
                 FilteringMethod.SUBGRID: {
-                    Implementation.PYTHON: PythonSubgridLowpassFilter
+                    Implementation.PYTHON: PythonSubgridLowpassFilter,
+                    Implementation.OPENCL: OpenClSubgridLowpassFilter
                 },
         }
         return ai

hysop/simulation.py

@@ -253,6 +253,7 @@ class Simulation(object):
             self._print_banner(msg)
             self.tkp1 = self.target_time_of_interest
             self.update_time_step(self.target_time_of_interest - self.t())
+            self._last_forced_timestep = self.dt()
         elif (self.tkp1 >= self.end):
             msg='** Next iteration is last iteration, clamping dt to achieve t={}. **'
             msg=msg.format(self.end)
@@ -261,8 +262,9 @@ class Simulation(object):
             self._next_is_last = True
             self.tkp1 = self.end
             self.update_time_step(self.end - self.t())
-        else:
+        elif (self.dt() == self._last_forced_timestep):
             self.update_time_step(self._dt0)
+            self._last_forced_timestep = None
 
         self.current_iteration += 1
         self.time = self.tkp1
@@ -347,6 +349,7 @@ class Simulation(object):
         self.is_over = False
         self.current_iteration = 0
         self._is_ready = True
+        self._last_forced_timestep = None
 
         for (io_params, params, kwds) in self._parameters_to_write:
             filename   = io_params.filename