Merge branch 'main' into add-flame-driver

illinois-ceesd · Feb 26, 2024 · 465ccbb · 465ccbb
2 parents 633c718 + 562d9f0
commit 465ccbb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -126,7 +126,6 @@ jobs:
             mamba install vtk  # needed for the accuracy comparison
 
             # Temporary workaround for https://github.com/conda-forge/openvino-feedstock/pull/73
-            [[ $(hostname) == "porter" ]] && conda uninstall --yes ocl-icd-system
 
             [[ $(hostname) == "porter" ]] && export PYOPENCL_TEST="port:nv" && unset XDG_CACHE_HOME
 
@@ -228,6 +227,5 @@ jobs:
             source ../config/activate_env.sh
 
             # Temporary workaround for https://github.com/conda-forge/openvino-feedstock/pull/73
-            [[ $(hostname) == "porter" ]] && conda uninstall --yes ocl-icd-system
 
             scripts/run-integrated-tests.sh --production
diff --git a/mirgecom/simutil.py b/mirgecom/simutil.py
@@ -279,7 +279,7 @@ def get_sim_timestep(
     actx = state.array_context
 
     if local_dt:
-        ones = dcoll.zeros(actx) + 1.0
+        ones = actx.np.zeros_like(state.cv.mass) + 1.0
         vdt = get_viscous_timestep(dcoll, state, dd=fluid_dd)
         emin = op.elementwise_min(dcoll, fluid_dd, vdt)
         return cfl * ones * emin