refactor: consolidate grid, stretch, and body force params into derived types

.github/Dockerfile

@@ -7,8 +7,6 @@ ARG CXX_COMPILER
 ARG FC_COMPILER
 ARG COMPILER_PATH
 ARG COMPILER_LD_LIBRARY_PATH
-ARG AFAR_VERSION
-ARG OLCF_AFAR_ROOT=""
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=UTC
@@ -29,47 +27,10 @@ RUN apt-get update -y && \
             python3.12 python3.12-venv python3-pip \
             libfftw3-dev \
             openmpi-bin libopenmpi-dev; \
-    elif [ "$TARGET" = "amd" ]; then \
-        apt-get install -y \
-            build-essential git make gcc g++ gfortran bc \
-            python3.12 python3.12-venv python3-pip \
-            libfftw3-dev libnuma1 libdrm2 libdrm-amdgpu1; \
     fi && \
     update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 2 && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# AMD: download AFAR, install cmake 3.28 (Ubuntu 22.04 ships 3.22 which doesn't
-# recognize amdflang as LLVMFlang), then build MPICH with amdflang so the
-# generated mpi.mod is compiler-compatible.
-RUN if [ "$TARGET" = "amd" ] && [ -n "$AFAR_VERSION" ]; then \
-        OLCF_AFAR_ROOT="/opt/${AFAR_VERSION}" && \
-        wget -q "https://repo.radeon.com/rocm/misc/flang/${AFAR_VERSION}-ubuntu.tar.bz2" -O /tmp/afar.tar.bz2 && \
-        tar -xjf /tmp/afar.tar.bz2 -C /opt/ && \
-        rm /tmp/afar.tar.bz2 && \
-        CMAKE_VER=3.28.6 && \
-        wget -q "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VER}/cmake-${CMAKE_VER}-linux-x86_64.sh" \
-            -O /tmp/cmake-install.sh && \
-        chmod +x /tmp/cmake-install.sh && \
-        /tmp/cmake-install.sh --prefix=/usr/local --skip-license --exclude-subdir && \
-        rm /tmp/cmake-install.sh && \
-        printf '#!/bin/bash\nargs=()\nwhile [ "$#" -gt 0 ]; do\n    if [ "$1" = "-soname" ]; then\n        args+=("-Wl,-soname,$2"); shift 2\n    else\n        args+=("$1"); shift\n    fi\ndone\nexec '"${OLCF_AFAR_ROOT}"'/bin/amdflang "${args[@]}"\n' \
-            > /usr/local/bin/amdflang-ld-wrap && \
-        chmod +x /usr/local/bin/amdflang-ld-wrap && \
-        MPICH_VER=3.4.3 && \
-        wget -q "https://www.mpich.org/static/downloads/${MPICH_VER}/mpich-${MPICH_VER}.tar.gz" \
-            -O /tmp/mpich.tar.gz && \
-        mkdir -p /tmp/mpich-src && \
-        tar -xzf /tmp/mpich.tar.gz -C /tmp/mpich-src --strip-components=1 && \
-        cd /tmp/mpich-src && \
-        FC=/usr/local/bin/amdflang-ld-wrap CC=gcc CXX=g++ \
-            ./configure --prefix=/opt/mpich --enable-shared --disable-static \
-            --with-device=ch3 2>&1 && \
-        make -j$(nproc) 2>&1 && \
-        make install 2>&1 && \
-        cd / && \
-        rm -rf /tmp/mpich-src /tmp/mpich.tar.gz; \
-    fi
-
 ENV OMPI_ALLOW_RUN_AS_ROOT=1
 ENV OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
 ENV HYDRA_LAUNCHER=fork
@@ -80,7 +41,6 @@ COPY ../ /opt/MFC
 ENV CC=${CC_COMPILER}
 ENV CXX=${CXX_COMPILER}
 ENV FC=${FC_COMPILER}
-ENV OLCF_AFAR_ROOT=${OLCF_AFAR_ROOT}
 ENV PATH="${COMPILER_PATH}:/opt/mpich/bin:$PATH"
 ENV LD_LIBRARY_PATH="${COMPILER_LD_LIBRARY_PATH}:/opt/mpich/lib:${LD_LIBRARY_PATH:-}"
 
@@ -95,17 +55,13 @@ RUN echo "TARGET=$TARGET CC=$CC_COMPILER FC=$FC_COMPILER" && \
     cd /opt/MFC && \
     if [ "$TARGET" = "gpu" ]; then \
       ./mfc.sh build --gpu acc -j $(nproc); \
-    elif [ "$TARGET" = "amd" ]; then \
-      ./mfc.sh build --gpu mp -j $(nproc); \
     else \
       ./mfc.sh build -j $(nproc); \
     fi
 
 RUN cd /opt/MFC && \
     if [ "$TARGET" = "gpu" ]; then \
       ./mfc.sh test -a --dry-run --gpu acc -j $(nproc); \
-    elif [ "$TARGET" = "amd" ]; then \
-      ./mfc.sh test -a --dry-run --gpu mp -j $(nproc); \
     else \
       ./mfc.sh test -a --dry-run -j $(nproc); \
     fi

.github/workflows/docker.yml

@@ -28,7 +28,6 @@ jobs:
             - { name: 'cpu',  tag: 'cpu',       runner: 'ubuntu-22.04-arm', base_image: 'ubuntu:22.04' }
             - { name: 'gpu',  tag: 'gpu-nvidia', runner: 'ubuntu-22.04',     base_image: 'nvcr.io/nvidia/nvhpc:24.5-devel-cuda_multi-ubuntu22.04', compiler_arch: 'Linux_x86_64' }
             - { name: 'gpu',  tag: 'gpu-nvidia', runner: 'ubuntu-22.04-arm', base_image: 'nvcr.io/nvidia/nvhpc:24.5-devel-cuda_multi-ubuntu22.04', compiler_arch: 'Linux_aarch64' }
-            - { name: 'amd',  tag: 'gpu-amd',   runner: 'ubuntu-22.04',     base_image: 'ubuntu:22.04' }
     runs-on: ${{ matrix.config.runner }}
     outputs:
       tag: ${{ steps.clone.outputs.tag }}
@@ -135,37 +134,6 @@ jobs:
             ${{ env.GH_REGISTRY }}:${{ env.TAG }}-${{ matrix.config.tag }}-${{ matrix.config.runner }}
           push: true
 
-      - name: Set AMD AFAR vars
-        if: ${{ matrix.config.name == 'amd' }}
-        run: |
-          AFAR=rocm-afar-8873-drop-22.2.0
-          ROOT="/opt/${AFAR}"
-          echo "AFAR_VERSION=${AFAR}"      >> $GITHUB_ENV
-          echo "AFAR_ROOT=${ROOT}"         >> $GITHUB_ENV
-
-      - name: Build and push image (amd)
-        if: ${{ matrix.config.name == 'amd' }}
-        uses: docker/build-push-action@v6
-        with:
-          context: /mnt/share
-          file: /mnt/share/Dockerfile
-          build-args: |
-            BASE_IMAGE=${{ matrix.config.base_image }}
-            TARGET=amd
-            AFAR_VERSION=${{ env.AFAR_VERSION }}
-            OLCF_AFAR_ROOT=${{ env.AFAR_ROOT }}
-            CC_COMPILER=gcc
-            CXX_COMPILER=g++
-            FC_COMPILER=${{ env.AFAR_ROOT }}/bin/amdflang
-            COMPILER_PATH=${{ env.AFAR_ROOT }}/lib/llvm/bin:${{ env.AFAR_ROOT }}/bin
-            COMPILER_LD_LIBRARY_PATH=${{ env.AFAR_ROOT }}/lib:${{ env.AFAR_ROOT }}/lib/llvm/lib
-          labels: |
-            org.opencontainers.image.source=https://github.com/${{ github.repository }}
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/mfc:${{ env.TAG }}-gpu-amd-ubuntu-22.04
-            ${{ env.GH_REGISTRY }}:${{ env.TAG }}-gpu-amd-ubuntu-22.04
-          push: true
-
   manifests:
     runs-on: ubuntu-latest
     needs: Container
@@ -201,9 +169,8 @@ jobs:
         run: |
           GH="${{ env.GH_REGISTRY }}"
           for R in "$DH" "$GH"; do
-            docker buildx imagetools create -t $R:$TAG-cpu       $R:$TAG-cpu-ubuntu-22.04 $R:$TAG-cpu-ubuntu-22.04-arm
+            docker buildx imagetools create -t $R:$TAG-cpu        $R:$TAG-cpu-ubuntu-22.04 $R:$TAG-cpu-ubuntu-22.04-arm
             docker buildx imagetools create -t $R:$TAG-gpu-nvidia $R:$TAG-gpu-nvidia-ubuntu-22.04 $R:$TAG-gpu-nvidia-ubuntu-22.04-arm
-            docker buildx imagetools create -t $R:$TAG-gpu-amd   $R:$TAG-gpu-amd-ubuntu-22.04
           done
 
       - name: Update latest tags
@@ -214,7 +181,6 @@ jobs:
         run: |
           GH="${{ env.GH_REGISTRY }}"
           for R in "$DH" "$GH"; do
-            docker buildx imagetools create -t $R:latest-cpu       $R:$TAG-cpu-ubuntu-22.04 $R:$TAG-cpu-ubuntu-22.04-arm
+            docker buildx imagetools create -t $R:latest-cpu        $R:$TAG-cpu-ubuntu-22.04 $R:$TAG-cpu-ubuntu-22.04-arm
             docker buildx imagetools create -t $R:latest-gpu-nvidia $R:$TAG-gpu-nvidia-ubuntu-22.04 $R:$TAG-gpu-nvidia-ubuntu-22.04-arm
-            docker buildx imagetools create -t $R:latest-gpu-amd   $R:$TAG-gpu-amd-ubuntu-22.04
           done

benchmarks/5eq_rk3_weno3_hllc/case.py

@@ -209,12 +209,12 @@
             "riemann_solver": 2,
             "wave_speeds": 1,
             "avg_state": 2,
-            "bc_x%beg": -6,
-            "bc_x%end": -6,
-            "bc_y%beg": -2,
-            "bc_y%end": -3,
-            "bc_z%beg": -2,
-            "bc_z%end": -3,
+            "bc%x%beg": -6,
+            "bc%x%end": -6,
+            "bc%y%beg": -2,
+            "bc%y%end": -3,
+            "bc%z%beg": -2,
+            "bc%z%end": -3,
             # Formatted Database Files Structure Parameters
             "format": 1,
             "precision": 2,

benchmarks/hypo_hll/case.py

@@ -64,12 +64,12 @@
             "riemann_solver": 1,
             "wave_speeds": 1,
             "avg_state": 2,
-            "bc_x%beg": -3,
-            "bc_x%end": -3,
-            "bc_y%beg": -3,
-            "bc_y%end": -3,
-            "bc_z%beg": -3,
-            "bc_z%end": -3,
+            "bc%x%beg": -3,
+            "bc%x%end": -3,
+            "bc%y%beg": -3,
+            "bc%y%end": -3,
+            "bc%z%beg": -3,
+            "bc%z%end": -3,
             # Turning on Hypoelasticity
             "hypoelasticity": "T",
             "fd_order": 4,

benchmarks/ibm/case.py

@@ -68,12 +68,12 @@
             "riemann_solver": 2,
             "wave_speeds": 1,
             "avg_state": 2,
-            "bc_x%beg": -3,
-            "bc_x%end": -3,
-            "bc_y%beg": -3,
-            "bc_y%end": -3,
-            "bc_z%beg": -3,
-            "bc_z%end": -3,
+            "bc%x%beg": -3,
+            "bc%x%end": -3,
+            "bc%y%beg": -3,
+            "bc%y%end": -3,
+            "bc%z%beg": -3,
+            "bc%z%end": -3,
             # Turn on IBM
             "ib": "T",
             "num_ibs": 1,

benchmarks/igr/case.py

@@ -71,12 +71,12 @@
             "num_fluids": 1,
             "riemann_solver": 5,
             "time_stepper": 3,
-            "bc_x%beg": -1,
-            "bc_x%end": -1,
-            "bc_y%beg": -1,
-            "bc_y%end": -1,
-            "bc_z%beg": -1,
-            "bc_z%end": -1,
+            "bc%x%beg": -1,
+            "bc%x%end": -1,
+            "bc%y%beg": -1,
+            "bc%y%end": -1,
+            "bc%z%beg": -1,
+            "bc%z%end": -1,
             "igr": "T",
             "igr_order": 5,
             "igr_iter_solver": 1,

benchmarks/viscous_weno5_sgb_acoustic/case.py

@@ -114,12 +114,12 @@
             "riemann_solver": 2,
             "wave_speeds": 1,
             "avg_state": 2,
-            "bc_x%beg": -3,
-            "bc_x%end": -3,
-            "bc_y%beg": -3,
-            "bc_y%end": -3,
-            "bc_z%beg": -3,
-            "bc_z%end": -3,
+            "bc%x%beg": -3,
+            "bc%x%end": -3,
+            "bc%y%beg": -3,
+            "bc%y%end": -3,
+            "bc%z%beg": -3,
+            "bc%z%end": -3,
             "viscous": "T",
             # Formatted Database Files Structure Parameters
             "format": 1,