diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index a3a87916e..f1aa1b9d1 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -179,6 +179,17 @@ jobs:
             os: ubuntu-24.04,
             cudaos: 'ubuntu2404',
             cc: "clang-18", cxx: "clang++-18", fc: "gfortran",
+            python: "false",
+            backend: "none",
+            amps_layer: mpi1,
+            netcdf: "true",
+            memory_manager: "none"
+          }
+        - {
+            name: "Ubuntu 24.04 GCC Python",
+            os: ubuntu-24.04,
+            cudaos: 'ubuntu2404',
+            cc: "gcc", cxx: "g++", fc: "gfortran",
             python: "true",
             tcl: "true",
             backend: "none",
@@ -194,6 +205,17 @@ jobs:
             cudaos: 'ubuntu2404',
             cc: "gcc", cxx: "g++", fc: "gfortran",
             python: "true",
+            backend: "none",
+            amps_layer: mpi1,
+            netcdf: "false",
+            memory_manager: "none"
+          }
+        - {
+            name: "Ubuntu 24.04 GCC OMP",
+            os: ubuntu-24.04,
+            cudaos: 'ubuntu2404',
+            cc: "gcc", cxx: "g++", fc: "gfortran",
+            python: "false",
             tcl: "true",
             backend: "omp",
             amps_layer: mpi1,
@@ -289,15 +311,7 @@ jobs:
         sudo apt-get -qq update
         sudo apt-get -qq install curl cmake build-essential tcl-dev tk-dev gfortran hdf5-helpers libcurl4 libcurl4-gnutls-dev
 
-    - name: HDF5 and OpenMPI Install on Ubuntu 22.04
-      if: matrix.config.os == 'ubuntu-22.04'
-      run: |
-        sudo apt-get -qq update
-        sudo apt -qq install libhdf5-openmpi-103 libhdf5-openmpi-dev
-
-    # libhdf5-openmpi-103 has been renamed in Ubuntu 24.04.
-    - name: HDF5 and OpenMPI Install on Ubuntu 24.04
-      if: matrix.config.os == 'ubuntu-24.04'
+    - name: HDF5 and OpenMPI Install
       run: |
         sudo apt-get -qq update
         sudo apt -qq install libhdf5-openmpi-103-1t64 libhdf5-openmpi-dev
diff --git a/pfsimulator/parflow_lib/CMakeLists.txt b/pfsimulator/parflow_lib/CMakeLists.txt
index c332a1674..8a8f2a729 100644
--- a/pfsimulator/parflow_lib/CMakeLists.txt
+++ b/pfsimulator/parflow_lib/CMakeLists.txt
@@ -120,8 +120,8 @@ set (SRC_FILES_CONST advect.F
   wells_lb.c
   reservoir.c
   reservoir_package.c
-  wrf_parflow.c
-  cpl_parflow.c
+  # wrf_parflow.c
+  # cpl_parflow.c
   write_clm_netcdf.c
   write_parflow_binary.c
   write_parflow_netcdf.c