return device scalar from estimate_rk4_timestep

inducer · Oct 25, 2021 · ed86d15 · ed86d15
1 parent b106569
commit ed86d15
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/examples/advection/surface.py b/examples/advection/surface.py
@@ -206,7 +206,8 @@ def rhs(t, u):
     # {{{ time stepping
 
     # FIXME: dt estimate is not necessarily valid for surfaces
-    dt = 0.45 * adv_operator.estimate_rk4_timestep(actx, dcoll, fields=u0)
+    dt = actx.to_numpy(
+        0.45 * adv_operator.estimate_rk4_timestep(actx, dcoll, fields=u0))
     nsteps = int(final_time // dt) + 1
 
     logger.info("dt:        %.5e", dt)

diff --git a/examples/advection/var-velocity.py b/examples/advection/var-velocity.py
@@ -196,7 +196,7 @@ def zero_inflow_bc(dtag, t=0):
     def rhs(t, u):
         return adv_operator.operator(t, u)
 
-    dt = adv_operator.estimate_rk4_timestep(actx, dcoll, fields=u)
+    dt = actx.to_numpy(adv_operator.estimate_rk4_timestep(actx, dcoll, fields=u))
 
     logger.info("Timestep size: %g", dt)
 

diff --git a/examples/advection/weak.py b/examples/advection/weak.py
@@ -166,7 +166,7 @@ def u_analytic(x, t=0):
     def rhs(t, u):
         return adv_operator.operator(t, u)
 
-    dt = adv_operator.estimate_rk4_timestep(actx, dcoll, fields=u)
+    dt = actx.to_numpy(adv_operator.estimate_rk4_timestep(actx, dcoll, fields=u))
 
     logger.info("Timestep size: %g", dt)
 

diff --git a/grudge/models/__init__.py b/grudge/models/__init__.py
@@ -71,4 +71,4 @@ def estimate_rk4_timestep(self, actx, dcoll, **kwargs):
             characteristic_lengthscales(actx, dcoll) / wavespeeds
         )
 
-        return actx.to_numpy(op.nodal_min(dcoll, "vol", local_timesteps))
+        return op.nodal_min(dcoll, "vol", local_timesteps)
diff --git a/test/test_grudge.py b/test/test_grudge.py
@@ -868,7 +868,7 @@ def analytic_sol(x, t=0):
         def rhs(t, w):
             return maxwell_operator.operator(t, w)
 
-        dt = maxwell_operator.estimate_rk4_timestep(actx, dcoll)
+        dt = actx.to_numpy(maxwell_operator.estimate_rk4_timestep(actx, dcoll))
         final_t = dt * 5
         nsteps = int(final_t/dt)
 

diff --git a/test/test_mpi_communication.py b/test/test_mpi_communication.py
@@ -176,7 +176,8 @@ def source_f(actx, dcoll, t=0):
         [dcoll.zeros(actx) for i in range(dcoll.dim)]
     )
 
-    dt = 2/3 * wave_op.estimate_rk4_timestep(actx, dcoll, fields=fields)
+    dt = actx.to_numpy(
+        2/3 * wave_op.estimate_rk4_timestep(actx, dcoll, fields=fields))
 
     wave_op.check_bc_coverage(local_mesh)