diff --git a/regtests/matrix_pdlib b/regtests/matrix_pdlib
deleted file mode 100644
index 405893118..000000000
--- a/regtests/matrix_pdlib
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-
-#SBATCH -n 440
-#SBATCH -q batch
-#SBATCH -t 02:00:00
-#SBATCH -A marine-cpu
-#SBATCH -J w3plb440
-#SBATCH -o w3plb440.out
-
-
-  NP0=440
-  NP1=361
-  DNP=-1
-  REGDIR=/scratch1/NCEPDEV/climate/Matthew.Masarik/projs/reproduce_mpi/regtest_ww3_ufs1.1-unstr/runs/ww3-blk-exp-03/regtests
-###  LOGFIL=$REGDIR/PdlibLog_${NP0}-${NP1}.txt
-
-  module purge
-  module load cmake/3.20.1
-  module load intel/2022.1.2
-  module load impi/2022.1.2
-  module use  /scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack
-  module load hpc/1.2.0
-  module load hpc-intel/2022.1.2
-  module load hpc-impi/2022.1.2
-  module load libpng/1.6.37
-  module load zlib/1.2.11
-  module load jasper/2.0.25
-  module load hdf5/1.10.6
-  module load netcdf/4.7.4
-  module load bacio/2.4.1
-  module load g2/3.4.5
-  module load w3emc/2.9.2
-  module load esmf/8.3.0b09
-  export METIS_PATH=/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hpc-stack/parmetis-4.0.3/install
-  export SCOTCH_PATH=/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hpc-stack/scotch-v7.0.3/install
-  export path_build_root=$REGDIR/build
-
-  function run_pdlib() {
-      if [ $# -ne 3 ]; then
-          echo 'usage: run_pdlib <nprocs> <worktag> <grid>'
-          return
-      fi
-      local nprocs=$1
-      local worktag=$2
-      local grid=$3
-      ./bin/run_cmake_test -b slurm -o all -S -T -s MPI -s PDLIB -i input_unstr -w work_${grid}_${nprocs}_${worktag} -g $grid -f -p srun -n $nprocs ../model ww3_ufs1.1
-      return
-  }
-
-  echo ' '
-  echo '             **********************************************'
-  echo '           ***     WAVEWATCH III    -     PDLIB           ***'
-  echo '             **********************************************'
-  echo ' '
-  cd $REGDIR
-  [[   -d ${path_build_root} ]] && rm -rf ${path_build_root}
-##  [[ ! -f ${LOGFIL}          ]] && touch  ${LOGFIL}
-
-  GRD="b"
-  TAG="run1"
-  for nn in $(seq $NP0 $DNP $NP1);
-  do
-      echo -e "\n\tSTRT: ** $nn $TAG $GRD **"
-      run_pdlib $nn $TAG $GRD
-      wait $!
-      echo -e   "\tFNSH: ** $nn $TAG $GRD **\n"
-  done
-
-  echo "done running."
-
-  [[ -d ${path_build_root} ]] && rm -rf ${path_build_root}*
-  echo ' '
-  echo '     **************************************************************'
-  echo '     *  end of WAVEWATCH III         -             PDLIB regtest  *'
-  echo '     **************************************************************'
-  echo ' '
diff --git a/regtests/matrix_pdlib_20-1 b/regtests/matrix_pdlib_20-1
deleted file mode 100644
index 5954f1d3a..000000000
--- a/regtests/matrix_pdlib_20-1
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-#SBATCH -n 40
-#SBATCH -q batch
-#SBATCH -t 08:00:00
-#SBATCH -A marine-cpu
-#SBATCH -J w3pdlib2
-#SBATCH -o w3pdlib2.out
-
-
-  NP0=20
-  NP1=1
-  DNP=-1
-  REGDIR=/scratch1/NCEPDEV/climate/Matthew.Masarik/projs/reproduce_mpi/regtest_ww3_ufs1.1-unstr/runs/ww3-blk-exp-03/regtests
-  LOGFIL=$REGDIR/PdlibLog_${NP0}-${NP1}.txt
-
-  module purge
-  module load cmake/3.20.1
-  module load intel/2022.1.2
-  module load impi/2022.1.2
-  module use  /scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack
-  module load hpc/1.2.0
-  module load hpc-intel/2022.1.2
-  module load hpc-impi/2022.1.2
-  module load libpng/1.6.37
-  module load zlib/1.2.11
-  module load jasper/2.0.25
-  module load hdf5/1.10.6
-  module load netcdf/4.7.4
-  module load bacio/2.4.1
-  module load g2/3.4.5
-  module load w3emc/2.9.2
-  module load esmf/8.3.0b09
-  export METIS_PATH=/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hpc-stack/parmetis-4.0.3/install
-  export SCOTCH_PATH=/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hpc-stack/scotch-v7.0.3/install
-  export path_build_root=$REGDIR/build
-
-  function run_pdlib() {
-      if [ $# -ne 3 ]; then
-          echo 'usage: run_pdlib <nprocs> <worktag> <grid>'
-          return
-      fi
-      local nprocs=$1
-      local worktag=$2
-      local grid=$3
-      ./bin/run_cmake_test -b slurm -o all -S -T -s MPI -s PDLIB -i input_unstr -w work_${grid}_${nprocs}_${worktag} -g $grid -f -p srun -n $nprocs ../model ww3_ufs1.1
-      return
-  }
-
-  function cmp_pdlib() {
-      if [ $# -ne 2 ]; then
-          echo 'usage: cmp_pdlib <wrkdir1> <wrkdir2>'
-          return
-      fi
-      local wrkdir1=$1
-      local wrkdir2=$2
-      ./bin/test.comp ww3_ufs1.1 work_${wrkdir1} work_${wrkdir2}
-      return
-  }
-
-
-
-  echo ' '
-  echo '             **********************************************'
-  echo '           ***     WAVEWATCH III    -     PDLIB           ***'
-  echo '             **********************************************'
-  echo ' '
-  cd $REGDIR
-  [[   -d ${path_build_root} ]] && rm -rf ${path_build_root}
-  [[ ! -f ${LOGFIL}          ]] && touch  ${LOGFIL}
-
-
-  # B: RUN1
-  GRD="b"
-  TAG="run1"
-  for nn in $(seq $NP0 $DNP $NP1);
-  do
-      echo  "STRT: ** $nn $TAG $GRD **"
-      run_pdlib $nn $TAG $GRD
-      cd ww3_ufs1.1
-      du -ks work_${GRD}_${nn}_${TAG}/restart*
-      du -ks work_${GRD}_${nn}_${TAG}/restart* >> $LOGFIL
-      echo  "FNSH: ** $nn $TAG $GRD **"
-      cd $REGDIR
-  done
-
-  echo "done running."
-
-  [[ -d ${path_build_root} ]] && rm -rf ${path_build_root}*
-  echo ' '
-  echo '     **************************************************************'
-  echo '     *  end of WAVEWATCH III         -             PDLIB regtest  *'
-  echo '     **************************************************************'
-  echo ' '
diff --git a/regtests/matrix_pdlib_40-19 b/regtests/matrix_pdlib_40-19
deleted file mode 100644
index 5cf2c22d0..000000000
--- a/regtests/matrix_pdlib_40-19
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-#SBATCH -n 40
-#SBATCH -q batch
-#SBATCH -t 08:00:00
-#SBATCH -A marine-cpu
-#SBATCH -J w3pdlib4
-#SBATCH -o w3pdlib4.out
-
-
-  NP0=40
-  NP1=20
-  DNP=-1
-  REGDIR=/scratch1/NCEPDEV/climate/Matthew.Masarik/projs/reproduce_mpi/regtest_ww3_ufs1.1-unstr/runs/ww3-blk-exp-03/regtests
-  LOGFIL=$REGDIR/PdlibLog_${NP0}-${NP1}.txt
-
-  module purge
-  module load cmake/3.20.1
-  module load intel/2022.1.2
-  module load impi/2022.1.2
-  module use  /scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack
-  module load hpc/1.2.0
-  module load hpc-intel/2022.1.2
-  module load hpc-impi/2022.1.2
-  module load libpng/1.6.37
-  module load zlib/1.2.11
-  module load jasper/2.0.25
-  module load hdf5/1.10.6
-  module load netcdf/4.7.4
-  module load bacio/2.4.1
-  module load g2/3.4.5
-  module load w3emc/2.9.2
-  module load esmf/8.3.0b09
-  export METIS_PATH=/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hpc-stack/parmetis-4.0.3/install
-  export SCOTCH_PATH=/scratch1/NCEPDEV/climate/Matthew.Masarik/waves/opt/hpc-stack/scotch-v7.0.3/install
-  export path_build_root=$REGDIR/build
-
-  function run_pdlib() {
-      if [ $# -ne 3 ]; then
-          echo 'usage: run_pdlib <nprocs> <worktag> <grid>'
-          return
-      fi
-      local nprocs=$1
-      local worktag=$2
-      local grid=$3
-      ./bin/run_cmake_test -b slurm -o all -S -T -s MPI -s PDLIB -i input_unstr -w work_${grid}_${nprocs}_${worktag} -g $grid -f -p srun -n $nprocs ../model ww3_ufs1.1
-      return
-  }
-
-  function cmp_pdlib() {
-      if [ $# -ne 2 ]; then
-          echo 'usage: cmp_pdlib <wrkdir1> <wrkdir2>'
-          return
-      fi
-      local wrkdir1=$1
-      local wrkdir2=$2
-      ./bin/test.comp ww3_ufs1.1 work_${wrkdir1} work_${wrkdir2}
-      return
-  }
-
-
-
-  echo ' '
-  echo '             **********************************************'
-  echo '           ***     WAVEWATCH III    -     PDLIB           ***'
-  echo '             **********************************************'
-  echo ' '
-  cd $REGDIR
-  [[   -d ${path_build_root} ]] && rm -rf ${path_build_root}
-  [[ ! -f ${LOGFIL}          ]] && touch  ${LOGFIL}
-
-
-  # B: RUN1
-  GRD="b"
-  TAG="run1"
-  for nn in $(seq $NP0 $DNP $NP1);
-  do
-      echo -e "\n\tSTRT: ** $nn $TAG $GRD **"
-      run_pdlib $nn $TAG $GRD
-      cd ww3_ufs1.1
-      du -ks work_${GRD}_${nn}_${TAG}/restart*
-      du -ks work_${GRD}_${nn}_${TAG}/restart* >> $LOGFIL
-      echo -e   "\tFNSH: ** $nn $TAG $GRD **\n"
-      cd $REGDIR
-  done
-
-  echo "done running."
-
-  [[ -d ${path_build_root} ]] && rm -rf ${path_build_root}*
-  echo ' '
-  echo '     **************************************************************'
-  echo '     *  end of WAVEWATCH III         -             PDLIB regtest  *'
-  echo '     **************************************************************'
-  echo ' '