diff --git a/examples/multiresolution/scalar_advection.py b/examples/multiresolution/scalar_advection.py index 45579d9fd140f5e9148fd5de723ea2165d305684..f9123b0ae83dadbc2f0b71f02188d85901271ef4 100644 --- a/examples/multiresolution/scalar_advection.py +++ b/examples/multiresolution/scalar_advection.py @@ -123,7 +123,7 @@ def compute(args): output_variables={scalar: npts}, filtering_method=FilteringMethod.SPECTRAL, plot_input_energy=IOParams(filename='E_fine_{fname}_{it}', frequency=args.dump_freq), - #plot_output_energy=IOParams(filename='E_coarse_{fname}_{it}', frequency=args.dump_freq), + plot_output_energy=IOParams(filename='E_coarse_{fname}_{it}', frequency=args.dump_freq), implementation=impl, **extra_op_kwds) diff --git a/hysop/backend/device/opencl/operator/spatial_filtering.py b/hysop/backend/device/opencl/operator/spatial_filtering.py index cf35c5b1d3d07efc3307c6dc04181ba30a32753e..b04b9a82d766061593a115062e8c7a622cfa6f04 100644 --- a/hysop/backend/device/opencl/operator/spatial_filtering.py +++ b/hysop/backend/device/opencl/operator/spatial_filtering.py @@ -33,7 +33,7 @@ class OpenClSpectralLowpassFilter(SpectralLowpassFilterBase, OpenClOperator): # the kernel_generator to fill ones and use explicit copy kernels # This seems to be the only solution to fill a non C-contiguous - # input_buffer with ones. + # OpenClinput_buffer with ones. buf = self.Ft.input_buffer buf, = kernel_generator.arrays_to_symbols(buf) expr = Assignment(buf, 1) @@ -48,7 +48,7 @@ class OpenClSpectralLowpassFilter(SpectralLowpassFilterBase, OpenClOperator): scaling = 1.0 / self.Bt.output_buffer[(0,)*self.FOUT.ndim].get() # Now we can finally build the filter scaling kernel - fout, = kernel_generator.arrays_to_symbols(self.Bt.output_buffer) + fout, = kernel_generator.arrays_to_symbols(self.FOUT) expr = Assignment(fout, scaling*fout) scale, _ = kernel_generator.elementwise_kernel('scale', expr) kl += scale diff --git a/hysop/operator/base/spectral_operator.py b/hysop/operator/base/spectral_operator.py index 0e7011a86d971d717421c970b65079d8623a5031..4cf985968b097dbe3f70861252e7f585aca635a2 100644 --- a/hysop/operator/base/spectral_operator.py +++ b/hysop/operator/base/spectral_operator.py @@ -1936,7 +1936,6 @@ SPECTRAL TRANSFORM SETUP unlock_mutexes = FFTI.plan_fill_zeros(tg=tg, a=mutexes_buffer, slices=(Ellipsis,)) compute_energy_queue += unlock_mutexes compute_energy_queue().wait() # we need this before compute energy to unlock mutexes - print mutexes_buffer.get() compute_energy_queue += FFTI.plan_compute_energy(tg=tg, fshape=field_buffer.shape, src=spectral_buffer, dst=energy_buffer, diff --git a/src/scalesInterface/particles/advec.f90 b/src/scalesInterface/particles/advec.f90 index a34d30614e394afe8aac3400b5ecb22af2f61ac9..897e6a8d7a5996db909e670ab8d97f4d773dc7db 100644 --- a/src/scalesInterface/particles/advec.f90 +++ b/src/scalesInterface/particles/advec.f90 @@ -234,7 +234,7 @@ subroutine advec_step_Inter_basic(dt, Vx, Vy, Vz, scal) call Interpol_3D(Vx, mesh_V%dx, Vx_f, mesh_sc%dx) call Interpol_3D(Vy, mesh_V%dx, Vy_f, mesh_sc%dx) call Interpol_3D(Vz, mesh_V%dx, Vz_f, mesh_sc%dx) - if (cart_rank==0) write(6,'(a)') ' [INFO PARTICLES] Interpolation done' + !if (cart_rank==0) write(6,'(a)') ' [INFO PARTICLES] Interpolation done' call advec_step_Torder2(dt, Vx_f, Vy_f, Vz_f, scal) diff --git a/src/scalesInterface/particles/advec_Vector.f90 b/src/scalesInterface/particles/advec_Vector.f90 index 6ddef2ca6290543c7c79e91df5a3ab5bad1b4922..43d1f1c59d7223b99807dffe001c791d6457f32c 100644 --- a/src/scalesInterface/particles/advec_Vector.f90 +++ b/src/scalesInterface/particles/advec_Vector.f90 @@ -92,7 +92,7 @@ subroutine advec_step_Inter_basic_Vect(dt, Vx, Vy, Vz, vectX, vectY, vectZ) call Interpol_3D(Vx, mesh_V%dx, Vx_f, mesh_sc%dx) call Interpol_3D(Vy, mesh_V%dx, Vy_f, mesh_sc%dx) call Interpol_3D(Vz, mesh_V%dx, Vz_f, mesh_sc%dx) - if (cart_rank==0) write(6,'(a)') ' [INFO PARTICLES] Interpolation done' + !if (cart_rank==0) write(6,'(a)') ' [INFO PARTICLES] Interpolation done' call advec_step_Vect(dt, Vx_f, Vy_f, Vz_f, vectX, vectY, vectZ)