Y1

.ci-support/.gitattributes

@@ -0,0 +1,2 @@
+production-setup.sh merge=ours
+production-driver-setup.sh merge=ours

.ci-support/production-driver-setup.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -x
+
+PRODUCTION_DRIVER_NAME="drivers_y1-nozzle"
+PRODUCTION_DRIVER_CHANGE_OWNER="illinois-ceesd"
+PRODUCTION_DRIVER_CHANGE_BRANCH="update-y1-callbacks"
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+git config user.email "stupid@dumb.com"
+git config user.name "CI Runner"
+if [ -n "${PRODUCTION_DRIVER_CHANGE_BRANCH}" ]; then
+    git remote add driver_change https://github.com/${PRODUCTION_DRIVER_CHANGE_OWNER}/${PRODUCTION_DRIVER_NAME}
+    git fetch driver_change
+    git checkout driver_change/${PRODUCTION_DRIVER_CHANGE_BRANCH}
+    git checkout ${CURRENT_BRANCH}
+    git merge driver_change/${PRODUCTION_DRIVER_CHANGE_BRANCH} --no-edit
+else
+    echo "No updates to production driver branch (${CURRENT_BRANCH})"
+fi

.ci-support/production-setup.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -x
+PRODUCTION_CHANGE_OWNER=""
+PRODUCTION_CHANGE_BRANCH=""
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+git config user.email "stupid@dumb.com"
+git config user.name "CI Runner"
+if [ -n "${PRODUCTION_CHANGE_BRANCH}" ]; then
+    git remote add production_change https://github.com/${PRODUCTION_CHANGE_OWNER}/mirgecom
+    git fetch production_change
+    git checkout production_change/${PRODUCTION_CHANGE_BRANCH}
+    git checkout ${CURRENT_BRANCH}
+    git merge production_change/${PRODUCTION_CHANGE_BRANCH} --no-edit
+else
+    echo "No updates to production branch (${CURRENT_BRANCH})"
+fi
+CURRENT_FORK_OWNER="illinois-ceesd"
+if [ -n "${GITHUB_HEAD_REF}" ]; then
+    git remote add changes https://github.com/${CURRENT_FORK_OWNER}/mirgecom
+    git fetch changes
+    git checkout changes/${GITHUB_HEAD_REF}
+    git checkout ${CURRENT_BRANCH}
+    git merge changes/${GITHUB_HEAD_REF} --no-edit
+fi

.github/workflows/ci.yaml

@@ -156,3 +156,33 @@ jobs:
             source emirge/config/activate_env.sh
             cd mirgecom/examples
             python -m mpi4py ./wave-eager-mpi.py
+
+    y1: 
+        name: Y1 production testing
+        runs-on: ${{ matrix.os }}
+        strategy:
+          matrix:
+            os: [ubuntu-latest, macos-latest]
+
+        steps:
+        - uses: actions/checkout@v2
+        - name: Prepare Y1 environment
+          run: |
+            [[ $(uname) == Linux ]] && sudo apt-get update && sudo apt-get install -y openmpi-bin libopenmpi-dev
+            [[ $(uname) == Darwin ]] && brew update && brew install mpich
+            cd ..
+            git clone https://github.com/illinois-ceesd/emirge emirge.y1
+            cd emirge.y1
+            ./install.sh --branch=y1-production
+            cd mirgecom
+            . ../../mirgecom/.ci-support/production-setup.sh
+
+        - name: Run Y1 production test
+          run: |
+            cd ..
+            source emirge.y1/config/activate_env.sh
+            git clone https://github.com/illinois-ceesd/drivers_y1-nozzle y1-production-driver
+            cd y1-production-driver
+            . ../mirgecom/.ci-support/production-driver-setup.sh
+            cd smoke_test
+            python -m mpi4py ./nozzle.py -i run_params.yaml

doc/misc.rst

@@ -71,3 +71,7 @@ References
     `(DOI) <https://doi.org/10.1007/978-3-642-59721-3_14>`__
 .. [Ihme_2014] Yu Lv and Matthias Ihme (2014) Journal of Computationsl Physics 270 105 \
     `(DOI) <http://dx.doi.org/10.1016/j.jcp.2014.03.029>`__
+.. [Persson_2012] P. Persson and J. Peraire, AIAA 44 \
+    `(DOI) <https://doi.org/10.2514/6.2006-112>`__
+.. [Woodward_1984] Woodward and Colella, Journal of Computational Physics, 54 \
+    `(DOI) <https://doi.org/10.1006/jcph.1996.5572>`__

doc/operators/artificial_viscosity.rst

@@ -0,0 +1,4 @@
+Artificial Viscosity
+====================
+
+.. automodule:: mirgecom.artificial_viscosity

doc/operators/operators.rst

@@ -6,4 +6,5 @@ Operators
 
    wave-eq
    diffusion
+   artificial_viscosity
    gas-dynamics

examples/autoignition-mpi.py

@@ -43,12 +43,12 @@
 
 from mirgecom.euler import euler_operator
 from mirgecom.simutil import (
+    get_sim_timestep,
     generate_and_distribute_mesh,
     write_visfile
 )
 from mirgecom.io import make_init_message
 from mirgecom.mpi import mpi_entry_point
-
 from mirgecom.integrators import rk4_step
 from mirgecom.steppers import advance_state
 from mirgecom.boundary import AdiabaticSlipBoundary
@@ -144,12 +144,11 @@ def main(ctx_factory=cl.create_some_context, use_logmgr=False,
     rst_pattern = (
         rst_path + "{cname}-{step:04d}-{rank:04d}.pkl"
     )
-    restarting = rst_filename is not None
-    if restarting:  # read the grid from restart data
-        rst_fname = f"{rst_filename}-{rank:04d}.pkl"
+    if rst_filename:  # read the grid from restart data
+        rst_filename = f"{rst_filename}-{rank:04d}.pkl"
 
         from mirgecom.restart import read_restart_data
-        restart_data = read_restart_data(actx, rst_fname)
+        restart_data = read_restart_data(actx, rst_filename)
         local_mesh = restart_data["local_mesh"]
         local_nelements = local_mesh.nelements
         global_nelements = restart_data["global_nelements"]
@@ -172,12 +171,17 @@ def main(ctx_factory=cl.create_some_context, use_logmgr=False,
     )
     nodes = thaw(actx, discr.nodes())
 
+    vis_timer = None
+
     if logmgr:
         logmgr_add_device_name(logmgr, queue)
         logmgr_add_device_memory_usage(logmgr, queue)
         logmgr_add_many_discretization_quantities(logmgr, discr, dim,
                              extract_vars_for_logging, units_for_logging)
 
+        vis_timer = IntervalTimer("t_vis", "Time spent visualizing")
+        logmgr.add_quantity(vis_timer)
+
         logmgr.add_watches([
             ("step.max", "step = {value}, "),
             ("t_sim.max", "sim time: {value:1.6e} s\n"),
@@ -189,9 +193,6 @@ def main(ctx_factory=cl.create_some_context, use_logmgr=False,
             ("t_log.max", "log walltime: {value:6g} s")
         ])
 
-        vis_timer = IntervalTimer("t_vis", "Time spent visualizing")
-        logmgr.add_quantity(vis_timer)
-
     # {{{  Set up initial state using Cantera
 
     # Use Cantera for initialization
@@ -262,7 +263,7 @@ def main(ctx_factory=cl.create_some_context, use_logmgr=False,
     my_boundary = AdiabaticSlipBoundary()
     boundaries = {BTAG_ALL: my_boundary}
 
-    if restarting:
+    if rst_filename:
         current_step = rst_step
         current_t = rst_time
         if logmgr:
@@ -315,16 +316,25 @@ def main(ctx_factory=cl.create_some_context, use_logmgr=False,
                     f" {eq_pressure=}, {eq_temperature=},"
                     f" {eq_density=}, {eq_mass_fractions=}")
 
-    def my_write_viz(step, t, state, dv=None, production_rates=None):
+    def my_write_status(dt, cfl):
+        status_msg = f"------ {dt=}" if constant_cfl else f"----- {cfl=}"
+        if rank == 0:
+            logger.info(status_msg)
+
+    def my_write_viz(step, t, dt, state, ts_field=None, dv=None,
+                     production_rates=None, cfl=None):
         if dv is None:
             dv = eos.dependent_vars(state)
         if production_rates is None:
             production_rates = eos.get_production_rates(state)
+        if ts_field is None:
+            ts_field, cfl, dt = my_get_timestep(t=t, dt=dt, state=state)
         viz_fields = [("cv", state),
                       ("dv", dv),
-                      ("production_rates", production_rates)]
+                      ("production_rates", production_rates),
+                      ("dt" if constant_cfl else "cfl", ts_field)]
         write_visfile(discr, viz_fields, visualizer, vizname=casename,
-                      step=step, t=t, overwrite=True)
+                      step=step, t=t, overwrite=True, vis_timer=vis_timer)
 
     def my_write_restart(step, t, state):
         rst_fname = rst_pattern.format(cname=casename, step=step, rank=rank)
@@ -358,6 +368,23 @@ def my_health_check(dv):
 
         return health_error
 
+    def my_get_timestep(t, dt, state):
+        #  richer interface to calculate {dt,cfl} returns node-local estimates
+        t_remaining = max(0, t_final - t)
+        if constant_cfl:
+            from mirgecom.inviscid import get_inviscid_timestep
+            ts_field = current_cfl * get_inviscid_timestep(discr, eos=eos, cv=state)
+            from grudge.op import nodal_min
+            dt = nodal_min(discr, "vol", ts_field)
+            cfl = current_cfl
+        else:
+            from mirgecom.inviscid import get_inviscid_cfl
+            ts_field = get_inviscid_cfl(discr, eos=eos, dt=dt, cv=state)
+            from grudge.op import nodal_max
+            cfl = nodal_max(discr, "vol", ts_field)
+
+        return ts_field, cfl, min(t_remaining, dt)
+
     def my_pre_step(step, t, dt, state):
         try:
             dv = None
@@ -369,6 +396,7 @@ def my_pre_step(step, t, dt, state):
             do_viz = check_step(step=step, interval=nviz)
             do_restart = check_step(step=step, interval=nrestart)
             do_health = check_step(step=step, interval=nhealth)
+            do_status = check_step(step=step, interval=nstatus)
 
             if do_health:
                 dv = eos.dependent_vars(state)
@@ -379,25 +407,30 @@ def my_pre_step(step, t, dt, state):
                         logger.info("Fluid solution failed health check.")
                     raise MyRuntimeError("Failed simulation health check.")
 
+            ts_field, cfl, dt = my_get_timestep(t=t, dt=dt, state=state)
+
+            if do_status:
+                my_write_status(dt, cfl)
+
             if do_restart:
                 my_write_restart(step=step, t=t, state=state)
 
             if do_viz:
                 production_rates = eos.get_production_rates(state)
                 if dv is None:
                     dv = eos.dependent_vars(state)
-                my_write_viz(step=step, t=t, state=state, dv=dv,
-                             production_rates=production_rates)
+                my_write_viz(step=step, t=t, dt=dt, state=state, dv=dv,
+                             production_rates=production_rates,
+                             ts_field=ts_field, cfl=cfl)
 
         except MyRuntimeError:
             if rank == 0:
                 logger.info("Errors detected; attempting graceful exit.")
-            my_write_viz(step=step, t=t, state=state)
+            my_write_viz(step=step, t=t, dt=dt, state=state)
             my_write_restart(step=step, t=t, state=state)
             raise
 
-        t_remaining = max(0, t_final - t)
-        return state, min(dt, t_remaining)
+        return state, dt
 
     def my_post_step(step, t, dt, state):
         # Logmgr needs to know about EOS, dt, dim?
@@ -413,6 +446,9 @@ def my_rhs(t, state):
                                boundaries=boundaries, eos=eos)
                 + eos.get_species_source_terms(state))
 
+    current_dt = get_sim_timestep(discr, current_state, current_t, current_dt,
+                                  current_cfl, eos, t_final, constant_cfl)
+
     current_step, current_t, current_state = \
         advance_state(rhs=my_rhs, timestepper=timestepper,
                       pre_step_callback=my_pre_step,
@@ -425,8 +461,11 @@ def my_rhs(t, state):
 
     final_dv = eos.dependent_vars(current_state)
     final_dm = eos.get_production_rates(current_state)
-    my_write_viz(step=current_step, t=current_t, state=current_state, dv=final_dv,
-                 production_rates=final_dm)
+    ts_field, cfl, dt = my_get_timestep(t=current_t, dt=current_dt,
+                                        state=current_state)
+    my_write_viz(step=current_step, t=current_t, dt=dt, state=current_state,
+                 dv=final_dv, production_rates=final_dm, ts_field=ts_field, cfl=cfl)
+    my_write_status(dt=dt, cfl=cfl)
     my_write_restart(step=current_step, t=current_t, state=current_state)
 
     if logmgr: