From 1657c44439c50d04a08c7a4f14f7c964d856d11f Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Keck <Jean-Baptiste.Keck@imag.fr>
Date: Tue, 28 Jul 2020 13:29:50 +0200
Subject: [PATCH] rebuild CI cache
---
ci/scripts/test.sh | 50 +++++++++----------
hysop/backend/device/opencl/opencl_env.py | 2 +-
.../particles_above_salt_periodic.py | 2 +-
.../particles_above_salt_symmetrized.py | 2 +-
4 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/ci/scripts/test.sh b/ci/scripts/test.sh
index 706a8f1e1..22e2996cb 100755
--- a/ci/scripts/test.sh
+++ b/ci/scripts/test.sh
@@ -112,31 +112,31 @@ example_test() {
echo
}
-if [ "$RUN_TESTS" = true ]; then
- hysop_test "core/arrays/tests/test_array.py"
- hysop_test "core/graph/tests/test_graph.py"
- hysop_test "fields/tests/test_fields.py"
- hysop_test "numerics/tests/test_fft.py"
- hysop_test "operator/tests/test_analytic.py"
- hysop_test "operator/tests/test_transpose.py"
- hysop_test "operator/tests/test_fd_derivative.py"
- hysop_test "operator/tests/test_absorption.py"
- hysop_test "operator/tests/test_penalization.py"
- hysop_test "operator/tests/test_velocity_correction.py"
- hysop_test "operator/tests/test_restriction_filter.py"
- hysop_test "operator/tests/test_directional_advection.py"
- hysop_test "operator/tests/test_directional_diffusion.py"
- hysop_test "operator/tests/test_directional_stretching.py"
- hysop_test "operator/tests/test_custom_symbolic.py"
- hysop_test "operator/tests/test_spectral_derivative.py"
- hysop_test "operator/tests/test_spectral_curl.py"
- hysop_test "operator/tests/test_diffusion.py"
- hysop_test "operator/tests/test_poisson.py"
- hysop_test "operator/tests/test_solenoidal_projection.py"
- hysop_test "operator/tests/test_poisson_curl.py"
- ${HYSOP_DIR}/fields/tests/test_cartesian.sh
- ${HYSOP_DIR}/core/tests/test_checkpoint.sh
-fi
+#if [ "$RUN_TESTS" = true ]; then
+ #hysop_test "core/arrays/tests/test_array.py"
+ #hysop_test "core/graph/tests/test_graph.py"
+ #hysop_test "fields/tests/test_fields.py"
+ #hysop_test "numerics/tests/test_fft.py"
+ #hysop_test "operator/tests/test_analytic.py"
+ #hysop_test "operator/tests/test_transpose.py"
+ #hysop_test "operator/tests/test_fd_derivative.py"
+ #hysop_test "operator/tests/test_absorption.py"
+ #hysop_test "operator/tests/test_penalization.py"
+ #hysop_test "operator/tests/test_velocity_correction.py"
+ #hysop_test "operator/tests/test_restriction_filter.py"
+ #hysop_test "operator/tests/test_directional_advection.py"
+ #hysop_test "operator/tests/test_directional_diffusion.py"
+ #hysop_test "operator/tests/test_directional_stretching.py"
+ #hysop_test "operator/tests/test_custom_symbolic.py"
+ #hysop_test "operator/tests/test_spectral_derivative.py"
+ #hysop_test "operator/tests/test_spectral_curl.py"
+ #hysop_test "operator/tests/test_diffusion.py"
+ #hysop_test "operator/tests/test_poisson.py"
+ #hysop_test "operator/tests/test_solenoidal_projection.py"
+ #hysop_test "operator/tests/test_poisson_curl.py"
+ #${HYSOP_DIR}/fields/tests/test_cartesian.sh
+ #${HYSOP_DIR}/core/tests/test_checkpoint.sh
+#fi
if [ "${RUN_LONG_TESTS}" = true ]; then
hysop_test "backend/device/codegen/kernels/tests/test_directional_advection.py"
diff --git a/hysop/backend/device/opencl/opencl_env.py b/hysop/backend/device/opencl/opencl_env.py
index 9362fd174..8668534bd 100644
--- a/hysop/backend/device/opencl/opencl_env.py
+++ b/hysop/backend/device/opencl/opencl_env.py
@@ -174,7 +174,7 @@ device.opencl_c_version, bytes2str(device.global_mem_size))
self.device_id = device_id
self.name = name
- #self._check_comm_devices()
+ self._check_comm_devices()
def build_typegen(self, precision, float_dump_mode,
use_short_circuit_ops, unroll_loops):
diff --git a/hysop_examples/examples/particles_above_salt/particles_above_salt_periodic.py b/hysop_examples/examples/particles_above_salt/particles_above_salt_periodic.py
index 0bf75e0b7..e4cc76457 100644
--- a/hysop_examples/examples/particles_above_salt/particles_above_salt_periodic.py
+++ b/hysop_examples/examples/particles_above_salt/particles_above_salt_periodic.py
@@ -265,7 +265,7 @@ def compute(args):
msg = msg.format(S_dt, C_dt, W_dt)
msg = '\n'+framed_str(' DIFFUSION STABILITY CRITERIA ', msg)
vprint(msg)
- max_dt = min(S_dt, C_dt, W_dt)
+ max_dt = min(S_dt, C_dt, W_dt, 1.0)
adapt_dt = AdaptiveTimeStep(dt, equivalent_CFL=True, max_dt=max_dt,
name='merge_dt', pretty_name='dt', )
diff --git a/hysop_examples/examples/particles_above_salt/particles_above_salt_symmetrized.py b/hysop_examples/examples/particles_above_salt/particles_above_salt_symmetrized.py
index 9ab6eae39..9f9f71677 100644
--- a/hysop_examples/examples/particles_above_salt/particles_above_salt_symmetrized.py
+++ b/hysop_examples/examples/particles_above_salt/particles_above_salt_symmetrized.py
@@ -254,7 +254,7 @@ def compute(args):
io_params=io_params)
### Adaptive timestep operator
- adapt_dt = AdaptiveTimeStep(dt, equivalent_CFL=True,
+ adapt_dt = AdaptiveTimeStep(dt, equivalent_CFL=True, max_dt=1.0,
name='merge_dt', pretty_name='dt', )
dt_cfl = adapt_dt.push_cfl_criteria(cfl=args.cfl,
Fmin=min_max_U.Fmin,
--
GitLab