Merge branch 'main' into add-flame-driver

.github/workflows/ci.yaml

@@ -18,9 +18,9 @@ jobs:
         name: Flake8
         runs-on: ubuntu-latest
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         -
-          uses: actions/setup-python@v4
+          uses: actions/setup-python@v5
           with:
             # matches compat target in setup.py
             python-version: '3.8'
@@ -36,9 +36,9 @@ jobs:
         name: Mypy
         runs-on: ubuntu-latest
         steps:
-        -   uses: actions/checkout@v3
+        -   uses: actions/checkout@v4
         -
-            uses: actions/setup-python@v4
+            uses: actions/setup-python@v5
             with:
                 python-version: '3.x'
         -   name: Install
@@ -55,9 +55,9 @@ jobs:
         name: Pylint
         runs-on: ubuntu-latest
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         -
-          uses: actions/setup-python@v4
+          uses: actions/setup-python@v5
           with:
             python-version: '3.x'
         - name: Install
@@ -73,9 +73,9 @@ jobs:
     pydocstyle:
         runs-on: ubuntu-latest
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         -
-          uses: actions/setup-python@v4
+          uses: actions/setup-python@v5
           with:
             python-version: '3.x'
         - name: Run Pydocstyle
@@ -91,7 +91,7 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - name: Install
           run: |
             . .ci-support/install.sh
@@ -112,7 +112,7 @@ jobs:
             os: [ubuntu-latest, porter]
 
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - name: Install
           run: |
             . .ci-support/install.sh
@@ -127,7 +127,7 @@ jobs:
 
             # 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
 
              # This is only possible because actions run sequentially on porter
@@ -140,7 +140,7 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - name: Install
           run: |
             . .ci-support/install.sh
@@ -172,7 +172,7 @@ jobs:
             os: [ubuntu-latest, macos-latest]
 
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - name: Install emirge
           run: |
             [[ $(uname) == Linux ]] && sudo apt-get update && sudo apt-get install -y openmpi-bin libopenmpi-dev
@@ -198,7 +198,7 @@ jobs:
             os: [ubuntu-latest, macos-latest, porter]
 
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
           with:
             fetch-depth: '0'
         - name: Prepare production environment
@@ -226,8 +226,8 @@ jobs:
         - name: Run production test
           run: |
             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

examples/combozzle.py

@@ -143,7 +143,7 @@ def __call__(self, x_vec, *, time=0.0):
 
 
 @mpi_entry_point
-def main(actx_class, rst_filename=None,
+def main(actx_class, rst_filename=None, use_tpe=False,
          use_overintegration=False, casename=None,
          log_dependent=False, input_file=None,
          force_eval=True, use_esdg=False):
@@ -602,7 +602,7 @@ def main(actx_class, rst_filename=None,
         rst_order = restart_data["order"]
     else:  # generate the grid from scratch
         generate_mesh = partial(get_box_mesh, dim, a=box_ll, b=box_ur, n=nels_axis,
-                                periodic=periodic)
+                                periodic=periodic, tensor_product_elements=use_tpe)
 
         local_mesh, global_nelements = generate_and_distribute_mesh(comm,
                                                                     generate_mesh)
@@ -612,7 +612,8 @@ def main(actx_class, rst_filename=None,
     if grid_only:
         return 0
 
-    dcoll = create_discretization_collection(actx, local_mesh, order)
+    dcoll = create_discretization_collection(actx, local_mesh, order,
+                                             tensor_product_elements=use_tpe)
     nodes = actx.thaw(dcoll.nodes())
     ones = dcoll.zeros(actx) + 1.0
 
@@ -1251,6 +1252,8 @@ def dummy_rhs(t, state):
         help="use numpy-based eager actx.")
     parser.add_argument("--restart_file", help="root name of restart file")
     parser.add_argument("--casename", help="casename to use for i/o")
+    parser.add_argument("--tpe", action="store_true",
+                        help="Use tensor product elements (quads/hexes).")
     args = parser.parse_args()
 
     from warnings import warn
@@ -1287,7 +1290,7 @@ def dummy_rhs(t, state):
 
     main(actx_class, input_file=input_file,
          use_overintegration=args.overintegration or args.esdg,
-         casename=casename, rst_filename=rst_filename,
+         casename=casename, rst_filename=rst_filename, use_tpe=args.tpe,
          log_dependent=log_dependent, force_eval=force_eval, use_esdg=args.esdg)
 
 # vim: foldmethod=marker