From a70244dab981d53b7533ab3ee2ab2c5b48bd840e Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Wed, 13 Sep 2023 21:50:03 +0000
Subject: [PATCH 1/5] ww3_grid.inp: update for Langmuir namelist (LMPN)

---
 model/inp/ww3_grid.inp | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/model/inp/ww3_grid.inp b/model/inp/ww3_grid.inp
index ef6121974..d24196830 100644
--- a/model/inp/ww3_grid.inp
+++ b/model/inp/ww3_grid.inp
@@ -423,6 +423,34 @@ $                                 provides 3 partitions of both x & y component,
 $                                 with a reasonable accuracy for using in
 $                                 a climate model.
 $
+$ Langmuir turbulence parameterization ------------------------------- $
+$
+$ In standalone WW3 simulations the default parameters should be used. In coupled
+$ simulations HSL can be received from the NUOPC cap or left at a uniform depth of
+$ 10m. Additionally, setting LMPENABLED to True allows for calculation of the
+$ surfaced averaged Stokes drift (USSHX/USSHY) and Langmuir parameters LAMULT
+$ (Langmuir enhancement factor), and LASL (surface layer averaged Langmuir number).
+$ The high frequency tail contribution can be added to the Stokes drift (USSX/USSY)
+$ as well as USSHX/USSHY by setting SDTAIL to True when LMPENABLED is also True.
+$ (Li et al., 2016, Ocean Modeling. http://dx.doi.org/10.1016/j.ocemod.2015.07.020)
+$
+$   Langmuir parameters : Namelist LMPN
+$                       LMPENABLED : Logical value controlling calculation of Stokes
+$                                    drift related quantities.
+$                                     T : Activates the calculation of surface layer
+$                                         Stokes drift and the tail contribution.
+$                                     F : (default) These calculations turned off.
+$                       SDTAIL     : Logical value controlling addition of the tail
+$                                    contribution (f^-5) to the Stokes drift.
+$                                     T : The tail contribution is added to the
+$                                         Stokes drift (LMPENABLED must also be T).
+$                                     F : (default) No tail contribution added.
+$                       HSLMODE    : Integer indicating the surface layer depth type.
+$                                     0 : (default) Uniform surface layer depth set
+$                                         to the value of HSL=10m.
+$                                     1 : Surface layer depth (HSL) recieved from
+$                                         NUOPC cap.
+$
 $ Miscellaneous ------------------------------------------------------ $
 $   Misc. parameters    : Namelist MISC
 $                           CICE0  : Ice concentration cut-off.

From 695ef0664071b84cad70cbf2f4a9a05bb433075f Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Thu, 14 Sep 2023 15:01:43 +0000
Subject: [PATCH 2/5] ww3_grid.inp: reference

---
 model/inp/ww3_grid.inp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/model/inp/ww3_grid.inp b/model/inp/ww3_grid.inp
index d24196830..f76fae7df 100644
--- a/model/inp/ww3_grid.inp
+++ b/model/inp/ww3_grid.inp
@@ -432,7 +432,7 @@ $ surfaced averaged Stokes drift (USSHX/USSHY) and Langmuir parameters LAMULT
 $ (Langmuir enhancement factor), and LASL (surface layer averaged Langmuir number).
 $ The high frequency tail contribution can be added to the Stokes drift (USSX/USSY)
 $ as well as USSHX/USSHY by setting SDTAIL to True when LMPENABLED is also True.
-$ (Li et al., 2016, Ocean Modeling. http://dx.doi.org/10.1016/j.ocemod.2015.07.020)
+$ Ref: (Li et al., 2016, Ocean Model.)
 $
 $   Langmuir parameters : Namelist LMPN
 $                       LMPENABLED : Logical value controlling calculation of Stokes

From 8237fd16a4469d71062ba2145beacf54a2e84cb6 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Thu, 14 Sep 2023 15:47:20 +0000
Subject: [PATCH 3/5] ww3_grid.inp, info: documentation updates

---
 model/inp/ww3_grid.inp   | 47 ++++++++++++++++++++--------------------
 regtests/ww3_tp2.22/info |  4 ++--
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/model/inp/ww3_grid.inp b/model/inp/ww3_grid.inp
index f76fae7df..735c87cd7 100644
--- a/model/inp/ww3_grid.inp
+++ b/model/inp/ww3_grid.inp
@@ -424,32 +424,31 @@ $                                 with a reasonable accuracy for using in
 $                                 a climate model.
 $
 $ Langmuir turbulence parameterization ------------------------------- $
-$
-$ In standalone WW3 simulations the default parameters should be used. In coupled
-$ simulations HSL can be received from the NUOPC cap or left at a uniform depth of
-$ 10m. Additionally, setting LMPENABLED to True allows for calculation of the
-$ surfaced averaged Stokes drift (USSHX/USSHY) and Langmuir parameters LAMULT
-$ (Langmuir enhancement factor), and LASL (surface layer averaged Langmuir number).
-$ The high frequency tail contribution can be added to the Stokes drift (USSX/USSY)
-$ as well as USSHX/USSHY by setting SDTAIL to True when LMPENABLED is also True.
-$ Ref: (Li et al., 2016, Ocean Model.)
+$   The LMPN namelist group configures the Langmuir Mixing
+$   Parameterization used within the context of climate modeling and
+$   when WW3 is coupled to an active ocean model (.e.g., POP2, MOM6).
+$   The LMPENABLED flag turns on the parameterization computations.
+$   The SDTAIL flag enables the spectral tail contribution. HSLMODE
+$   parameter determines the surface layer depth (HSL).
 $
 $   Langmuir parameters : Namelist LMPN
-$                       LMPENABLED : Logical value controlling calculation of Stokes
-$                                    drift related quantities.
-$                                     T : Activates the calculation of surface layer
-$                                         Stokes drift and the tail contribution.
-$                                     F : (default) These calculations turned off.
-$                       SDTAIL     : Logical value controlling addition of the tail
-$                                    contribution (f^-5) to the Stokes drift.
-$                                     T : The tail contribution is added to the
-$                                         Stokes drift (LMPENABLED must also be T).
-$                                     F : (default) No tail contribution added.
-$                       HSLMODE    : Integer indicating the surface layer depth type.
-$                                     0 : (default) Uniform surface layer depth set
-$                                         to the value of HSL=10m.
-$                                     1 : Surface layer depth (HSL) recieved from
-$                                         NUOPC cap.
+$                       LMPENABLED : Logical controlling Langmuir
+$                                    related computations.
+$                                     T : Activates calculations
+$                                     F : Calculations off (default)
+$                       SDTAIL     : Logical controlling addition of
+$                                    tail contribution.
+$                                     T : Tail added to Stokes
+$                                         drift (LMPENABLED=T also).
+$                                     F : No tail added (default)
+$                       HSLMODE    : Integer indicating surface layer
+$                                    depth (HSL) type.
+$                                     0 : Uniform HSL=10m (default)
+$                                     1 : HSL from coupler
+$
+$   For more info on the Langmuir parameterization, see:
+$       Li, Qing, et al. "Langmuir mixing effects on global climate:
+$       WAVEWATCH III in CESM." Ocean Modelling 103 (2016): 145-160.
 $
 $ Miscellaneous ------------------------------------------------------ $
 $   Misc. parameters    : Namelist MISC
diff --git a/regtests/ww3_tp2.22/info b/regtests/ww3_tp2.22/info
index dc9376ebb..576995848 100644
--- a/regtests/ww3_tp2.22/info
+++ b/regtests/ww3_tp2.22/info
@@ -44,7 +44,7 @@
 #  Sample run_test commands :                                               #
 #   (Note: mpirun commands differ by local system)                          #
 #  ./bin/run_test                   -s PR1     ../model ww3_tp2.22          #
-#  ./bin/run_test -n 3 -p mpirun -f -s PR1_MPI ../model ww3_tp2.22          # 
+#  ./bin/run_test -n 3 -p mpirun -f -s PR1_MPI ../model ww3_tp2.22          #
 #                                                                           #
 #                                              Hendrik Tolman, Jun 2002     #
 #                                                   Last Mod : Dec 2013     #
@@ -53,7 +53,7 @@
 #                                                                           #
 #    The LMPN namelist group configures the Langmuir Mixing                 #
 #    Parameterization used within the context of climate modeling and       #
-#    when WW3 is coupled with an active ocean model (.e.g., POP2, MOM6.     #
+#    when WW3 is coupled with an active ocean model (.e.g., POP2, MOM6).    #
 #    The LMPENABLED flag turns on the parameterization computations.        #
 #    The SDTAIL flag enabled the spectral tail contribution.                #
 #    HSLMODE parameter determines the surface layer depth (HSL).            #

From 9bc25b7c49a93feb3742d80957f3a228b1dce887 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Thu, 14 Sep 2023 18:13:37 +0000
Subject: [PATCH 4/5] matrix.base, matrix_cmake_ncep: first attempt at setting
 up regtest call

---
 regtests/bin/matrix.base       | 229 +++++++++++++++++----------------
 regtests/bin/matrix_cmake_ncep |   1 +
 2 files changed, 120 insertions(+), 110 deletions(-)

diff --git a/regtests/bin/matrix.base b/regtests/bin/matrix.base
index a273372a9..afbb995f8 100755
--- a/regtests/bin/matrix.base
+++ b/regtests/bin/matrix.base
@@ -31,7 +31,7 @@
              prop1D prop2D time fetch hur1mg \
              multi01 multi02 multi03 multi04 multi05 \
              hybd shwtr unstr pdlib smcgr rtd mudice infgrv \
-             uost assim calendar confignc oasis \
+             lmp uost assim calendar confignc oasis \
              esmf ufs ufscoarse rstrt_b4b nth_b4b npl_b4b grib \
              multi06 multi07 multi08 multi09
   do
@@ -74,6 +74,7 @@
   echo "  echo '      Growth curves (fetch)              : $fetch'"            >> matrix.head
   echo "  echo '      Shallow water tests                : $shwtr'"            >> matrix.head
   echo "  echo '      Unstructured grid tests            : $unstr'"            >> matrix.head
+  echo "  echo '      Langmuir mixing parameterization   : $lmp'"              >> matrix.head
   echo "  echo '      SMC grid tests                     : $smcgr'"            >> matrix.head
   echo "  echo '      Rotated pole tests                 : $rtd'"              >> matrix.head
   echo "  echo '      Hurricane with one moving grid     : $hur1mg'"           >> matrix.head
@@ -171,7 +172,7 @@
       echo "$rtst -s PR1 -w work_PR1_f -m grdset_f $ww3 mww3_test_04" >> matrix.body
       echo "$rtst -s PR1 -w work_PR1_g -m grdset_g $ww3 mww3_test_04" >> matrix.body
     fi
-  
+
   fi
 
   if [ "$dist" = 'y' ]
@@ -224,7 +225,7 @@
       echo "$rtst -s PR1_MPI -w work_PR1_MPI_d  -m grdset_d  -f -p $mpi -n $np $ww3 mww3_test_04" >> matrix.body
       echo "$rtst -s PR1_MPI -w work_PR1_MPI_e  -m grdset_e  -f -p $mpi -n $np $ww3 mww3_test_04" >> matrix.body
     fi
-  
+
   fi
 
   if [ "$prop2D" = 'y' ] && [ "$dist" = 'y' ]
@@ -812,6 +813,11 @@
       echo "$rtst -s MPI                     -w work_MPI_5km         -g 5km      -f -p $mpi -n $np $ww3 ww3_tp2.15" >> matrix.body
       echo "$rtst -s MPI        -i input_rho -w work_PR3_UQ_RHO_MPI              -f -p $mpi -n $np $ww3 ww3_tp2.15" >> matrix.body
       echo "$rtst -s TIDE_MPI                -w work_TIDE_MPI                    -f -p $mpi -n $np $ww3 ww3_tp2.18" >> matrix.body
+
+      if [ "$lmp" == "y" ];      # Langmuir mixing parameterization
+      then
+        echo "$rtst -s PR3_UQ_MPI              -w work_PR3_UQ_MPI                  -f -p $mpi -n $np $ww3 ww3_tp2.22" >> matrix.body
+      fi
     fi
 
     if [ "$multi01" = 'y' ]
@@ -985,9 +991,9 @@
   if [ "$dist" = 'y' ]
   then
 
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -998,7 +1004,7 @@
       echo "$rtst -s ST1_PR1_MPI     -w work_ST1_PR1_MPI     -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1009,7 +1015,7 @@
       echo "$rtst -s ST1_PR2_UQ_MPI  -w work_ST1_PR2_UQ_MPI  -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1020,7 +1026,7 @@
       echo "$rtst -s ST1_PR2_UNO_MPI -w work_ST1_PR2_UNO_MPI -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1031,7 +1037,7 @@
       echo "$rtst -s ST1_PR3_UQ_MPI  -w work_ST1_PR3_UQ_MPI  -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1041,9 +1047,9 @@
     then
       echo "$rtst -s ST1_PR3_UNO_MPI -w work_ST1_PR3_UNO_MPI -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1054,7 +1060,7 @@
       echo "$rtst -s ST2_PR1_MPI     -w work_ST2_PR1_MPI     -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1065,7 +1071,7 @@
       echo "$rtst -s ST2_PR2_UQ_MPI  -w work_ST2_PR2_UQ_MPI  -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1076,7 +1082,7 @@
       echo "$rtst -s ST2_PR2_UNO_MPI -w work_ST2_PR2_UNO_MPI -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1087,7 +1093,7 @@
       echo "$rtst -s ST2_PR3_UQ_MPI  -w work_ST2_PR3_UQ_MPI  -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1097,9 +1103,9 @@
     then
       echo "$rtst -s ST2_PR3_UNO_MPI -w work_ST2_PR3_UNO_MPI -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1110,7 +1116,7 @@
       echo "$rtst -s ST3_PR1_MPI     -w work_ST3_PR1_MPI     -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1121,7 +1127,7 @@
       echo "$rtst -s ST3_PR2_UQ_MPI  -w work_ST3_PR2_UQ_MPI  -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1132,7 +1138,7 @@
       echo "$rtst -s ST3_PR2_UNO_MPI -w work_ST3_PR2_UNO_MPI -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1143,7 +1149,7 @@
       echo "$rtst -s ST3_PR3_UQ_MPI  -w work_ST3_PR3_UQ_MPI  -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1153,9 +1159,9 @@
     then
       echo "$rtst -s ST3_PR3_UNO_MPI -w work_ST3_PR3_UNO_MPI -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1168,7 +1174,7 @@
       echo "$rtst -s ST4_PR1_MPI     -w work_ST4_PR1_MPI     -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1179,7 +1185,7 @@
       echo "$rtst -s ST4_PR2_UQ_MPI  -w work_ST4_PR2_UQ_MPI  -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1190,7 +1196,7 @@
       echo "$rtst -s ST4_PR2_UNO_MPI -w work_ST4_PR2_UNO_MPI -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1201,7 +1207,7 @@
       echo "$rtst -s ST4_PR3_UQ_MPI  -w work_ST4_PR3_UQ_MPI  -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1211,9 +1217,9 @@
     then
       echo "$rtst -s ST4_PR3_UNO_MPI -w work_ST4_PR3_UNO_MPI -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1224,7 +1230,7 @@
       echo "$rtst -s ST6_PR1_MPI     -w work_ST6_PR1_MPI     -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1235,7 +1241,7 @@
       echo "$rtst -s ST6_PR2_UQ_MPI  -w work_ST6_PR2_UQ_MPI  -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1246,7 +1252,7 @@
       echo "$rtst -s ST6_PR2_UNO_MPI -w work_ST6_PR2_UNO_MPI -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1257,7 +1263,7 @@
       echo "$rtst -s ST6_PR3_UQ_MPI  -w work_ST6_PR3_UQ_MPI  -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1268,7 +1274,7 @@
       echo "$rtst -s ST6_PR3_UNO_MPI -w work_ST6_PR3_UNO_MPI -m grdset_a -f -p $mpi -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
   fi
 
@@ -1278,9 +1284,9 @@
   if [ "$hybd" = 'y' ]
   then
 
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1291,7 +1297,7 @@
       echo "$rtst -s ST1_PR1_MPI_OMPH     -w work_ST1_PR1_MPI_OMPH     -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1302,7 +1308,7 @@
       echo "$rtst -s ST1_PR2_UQ_MPI_OMPH  -w work_ST1_PR2_UQ_MPI_OMPH  -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1313,7 +1319,7 @@
       echo "$rtst -s ST1_PR2_UNO_MPI_OMPH -w work_ST1_PR2_UNO_MPI_OMPH -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1324,7 +1330,7 @@
       echo "$rtst -s ST1_PR3_UQ_MPI_OMPH  -w work_ST1_PR3_UQ_MPI_OMPH  -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1334,9 +1340,9 @@
     then
       echo "$rtst -s ST1_PR3_UNO_MPI_OMPH -w work_ST1_PR3_UNO_MPI_OMPH -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1347,7 +1353,7 @@
       echo "$rtst -s ST2_PR1_MPI_OMPH     -w work_ST2_PR1_MPI_OMPH     -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1358,7 +1364,7 @@
       echo "$rtst -s ST2_PR2_UQ_MPI_OMPH  -w work_ST2_PR2_UQ_MPI_OMPH  -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1369,7 +1375,7 @@
       echo "$rtst -s ST2_PR2_UNO_MPI_OMPH -w work_ST2_PR2_UNO_MPI_OMPH -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1380,7 +1386,7 @@
       echo "$rtst -s ST2_PR3_UQ_MPI_OMPH  -w work_ST2_PR3_UQ_MPI_OMPH  -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1390,9 +1396,9 @@
     then
       echo "$rtst -s ST2_PR3_UNO_MPI_OMPH -w work_ST2_PR3_UNO_MPI_OMPH -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1403,7 +1409,7 @@
       echo "$rtst -s ST3_PR1_MPI_OMPH     -w work_ST3_PR1_MPI_OMPH     -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1414,7 +1420,7 @@
       echo "$rtst -s ST3_PR2_UQ_MPI_OMPH  -w work_ST3_PR2_UQ_MPI_OMPH  -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1425,7 +1431,7 @@
       echo "$rtst -s ST3_PR2_UNO_MPI_OMPH -w work_ST3_PR2_UNO_MPI_OMPH -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1436,7 +1442,7 @@
       echo "$rtst -s ST3_PR3_UQ_MPI_OMPH  -w work_ST3_PR3_UQ_MPI_OMPH  -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1446,9 +1452,9 @@
     then
       echo "$rtst -s ST3_PR3_UNO_MPI_OMPH -w work_ST3_PR3_UNO_MPI_OMPH -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1459,7 +1465,7 @@
       echo "$rtst -s ST4_PR1_MPI_OMPH     -w work_ST4_PR1_MPI_OMPH     -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1470,7 +1476,7 @@
       echo "$rtst -s ST4_PR2_UQ_MPI_OMPH  -w work_ST4_PR2_UQ_MPI_OMPH  -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1481,7 +1487,7 @@
       echo "$rtst -s ST4_PR2_UNO_MPI_OMPH -w work_ST4_PR2_UNO_MPI_OMPH -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1492,7 +1498,7 @@
       echo "$rtst -s ST4_PR3_UQ_MPI_OMPH  -w work_ST4_PR3_UQ_MPI_OMPH  -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1502,9 +1508,9 @@
     then
       echo "$rtst -s ST4_PR3_UNO_MPI_OMPH -w work_ST4_PR3_UNO_MPI_OMPH -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1515,7 +1521,7 @@
       echo "$rtst -s ST6_PR1_MPI_OMPH     -w work_ST6_PR1_MPI_OMPH     -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1526,7 +1532,7 @@
       echo "$rtst -s ST6_PR2_UQ_MPI_OMPH  -w work_ST6_PR2_UQ_MPI_OMPH  -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1537,7 +1543,7 @@
       echo "$rtst -s ST6_PR2_UNO_MPI_OMPH -w work_ST6_PR2_UNO_MPI_OMPH -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1548,7 +1554,7 @@
       echo "$rtst -s ST6_PR3_UQ_MPI_OMPH  -w work_ST6_PR3_UQ_MPI_OMPH  -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1559,7 +1565,7 @@
       echo "$rtst -s ST6_PR3_UNO_MPI_OMPH -w work_ST6_PR3_UNO_MPI_OMPH -m grdset_a -f -p $mpi -n $nr -t $nth $ww3 mww3_test_05" >> matrix.body
     fi
 
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
   fi
 # Moving grid cases for OpenMP, ww3_ts3 and mww3_test_05 share switches
@@ -1568,9 +1574,9 @@
   if [ "$omp" = 'y' ]
   then
 
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1581,7 +1587,7 @@
       echo "$rtst -s ST1_PR1_OMP     -w work_ST1_PR1_OMP     -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1592,7 +1598,7 @@
       echo "$rtst -s ST1_PR2_UQ_OMP  -w work_ST1_PR2_UQ_OMP  -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1603,7 +1609,7 @@
       echo "$rtst -s ST1_PR2_UNO_OMP -w work_ST1_PR2_UNO_OMP -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1614,7 +1620,7 @@
       echo "$rtst -s ST1_PR3_UQ_OMP  -w work_ST1_PR3_UQ_OMP  -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1624,9 +1630,9 @@
     then
       echo "$rtst -s ST1_PR3_UNO_OMP -w work_ST1_PR3_UNO_OMP -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1637,7 +1643,7 @@
       echo "$rtst -s ST2_PR1_OMP     -w work_ST2_PR1_OMP     -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1648,7 +1654,7 @@
       echo "$rtst -s ST2_PR2_UQ_OMP  -w work_ST2_PR2_UQ_OMP  -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1659,7 +1665,7 @@
       echo "$rtst -s ST2_PR2_UNO_OMP -w work_ST2_PR2_UNO_OMP -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1670,7 +1676,7 @@
       echo "$rtst -s ST2_PR3_UQ_OMP  -w work_ST2_PR3_UQ_OMP  -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1680,9 +1686,9 @@
     then
       echo "$rtst -s ST2_PR3_UNO_OMP -w work_ST2_PR3_UNO_OMP -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1693,7 +1699,7 @@
       echo "$rtst -s ST3_PR1_OMP     -w work_ST3_PR1_OMP     -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1704,7 +1710,7 @@
       echo "$rtst -s ST3_PR2_UQ_OMP  -w work_ST3_PR2_UQ_OMP  -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1715,7 +1721,7 @@
       echo "$rtst -s ST3_PR2_UNO_OMP -w work_ST3_PR2_UNO_OMP -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1726,7 +1732,7 @@
       echo "$rtst -s ST3_PR3_UQ_OMP  -w work_ST3_PR3_UQ_OMP  -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1736,9 +1742,9 @@
     then
       echo "$rtst -s ST3_PR3_UNO_OMP -w work_ST3_PR3_UNO_OMP -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1749,7 +1755,7 @@
       echo "$rtst -s ST4_PR1_OMP     -w work_ST4_PR1_OMP     -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1760,7 +1766,7 @@
       echo "$rtst -s ST4_PR2_UQ_OMP  -w work_ST4_PR2_UQ_OMP  -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1771,7 +1777,7 @@
       echo "$rtst -s ST4_PR2_UNO_OMP -w work_ST4_PR2_UNO_OMP -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1782,7 +1788,7 @@
       echo "$rtst -s ST4_PR3_UQ_OMP  -w work_ST4_PR3_UQ_OMP  -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1792,9 +1798,9 @@
     then
       echo "$rtst -s ST4_PR3_UNO_OMP -w work_ST4_PR3_UNO_OMP -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1805,7 +1811,7 @@
       echo "$rtst -s ST6_PR1_OMP     -w work_ST6_PR1_OMP     -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1816,7 +1822,7 @@
       echo "$rtst -s ST6_PR2_UQ_OMP  -w work_ST6_PR2_UQ_OMP  -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1827,7 +1833,7 @@
       echo "$rtst -s ST6_PR2_UNO_OMP -w work_ST6_PR2_UNO_OMP -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1838,7 +1844,7 @@
       echo "$rtst -s ST6_PR3_UQ_OMP  -w work_ST6_PR3_UQ_OMP  -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
 
-    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then 
+    if [ "$hur1mg" = 'y' ] || [ "$multi05" = 'y' ] ; then
       echo ' ' >> matrix.body ; fi
     if [ "$hur1mg" = 'y' ]
     then
@@ -1848,13 +1854,13 @@
     then
       echo "$rtst -s ST6_PR3_UNO_OMP -w work_ST6_PR3_UNO_OMP -m grdset_a -f -O -n $np $ww3 mww3_test_05" >> matrix.body
     fi
-# - - - - - - - - - - - - 
+# - - - - - - - - - - - -
 
   fi
 
 # Second harmonic test case
 
-  if [ "$infgrv" = 'y' ] && [ "$shrd" = 'y' ] 
+  if [ "$infgrv" = 'y' ] && [ "$shrd" = 'y' ]
   then
     echo ' ' >> matrix.body
     echo "$rtst $ww3 -w work_IG1 ww3_tig1.1" >> matrix.body
@@ -1974,7 +1980,7 @@
     echo "$rtst -s IC1IS2        -w work_IC1IS2_1000      -g 1000m                  $ww3 ww3_tic1.4" >> matrix.body
     echo "$rtst -s IC2IS2        -w work_IC2IS2_IC2b      -g IC2b_1000m             $ww3 ww3_tic1.4" >> matrix.body
     echo "$rtst -s IC2IS2        -w work_IC2IS2_IC2d      -g IC2d_1000m             $ww3 ww3_tic1.4" >> matrix.body
-    echo "$rtst -s IC2IS2        -w work_IC2IS2scat       -g scat                   $ww3 ww3_tic2.3" >> matrix.body    
+    echo "$rtst -s IC2IS2        -w work_IC2IS2scat       -g scat                   $ww3 ww3_tic2.3" >> matrix.body
     echo "$rtst -s IC2IS2        -w work_IC2IS2creep      -g creepOnly              $ww3 ww3_tic2.3" >> matrix.body
     echo "$rtst -s IC2IS2        -w work_IC2IS2dissip     -g dissipOnly             $ww3 ww3_tic2.3" >> matrix.body
   fi
@@ -2006,7 +2012,7 @@
    echo "$rtst -s MPI -s NO_PDLIB -w work_ma    -m grdset_a -f -p $mpi -n $np $ww3 ww3_tp2.17"     >> matrix.body
    echo "$rtst -s MPI -s PDLIB    -w work_b     -g b        -f -p $mpi -n $np $ww3 ww3_tp2.17"     >> matrix.body
    echo "$rtst -s MPI -s PDLIB    -w work_c     -g c        -f -p $mpi -n $np $ww3 ww3_tp2.17"     >> matrix.body
-   echo "$rtst -s MPI -s PDLIB    -w work_pdlib -g pdlib    -f -p $mpi -n $np $ww3 ww3_tp2.6"      >> matrix.body 
+   echo "$rtst -s MPI -s PDLIB    -w work_pdlib -g pdlib    -f -p $mpi -n $np $ww3 ww3_tp2.6"      >> matrix.body
    echo "$rtst -s MPI -s PDLIB    -w work_mb    -m grdset_b -f -p $mpi -n $np $ww3 ww3_tp2.17"     >> matrix.body
    echo "$rtst -s MPI -s PDLIB    -w work_mc    -m grdset_c -f -p $mpi -n $np $ww3 ww3_tp2.17"     >> matrix.body
      if [ "$rstrt_b4b" = 'y' ]
@@ -2023,7 +2029,7 @@
  fi
 
  # unstructured grid with PDLIB for domain decomposition and implicit solver, Neumann Bnd, depth breaking & triad interaction ST
- if [ "$pdlib" = 'y' ] && [ "$dist" = 'y' ] 
+ if [ "$pdlib" = 'y' ] && [ "$dist" = 'y' ]
  then
    echo ' ' >> matrix.body
    echo "$rtst -s MPI -s PDLIB -w work_1A_a -f -g a -p $mpi -n $np -o netcdf -i input_Case1A $ww3 ww3_tp2.19" >> matrix.body
@@ -2032,23 +2038,23 @@
  fi
 
 
- #Unresolved Obstacles Source Term (UOST) 
- if [ "$uost" = 'y' ] 
+ #Unresolved Obstacles Source Term (UOST)
+ if [ "$uost" = 'y' ]
  then
    echo ' ' >> matrix.body
    if [ "$dist" = 'y' ]
-   then 
+   then
      echo "$rtst -s MPI -w work_rg_shel_MPI  -i input_rg_shel            -f -p $mpi -n $np $ww3 ww3_ts4" >> matrix.body
      echo "$rtst -s MPI -w work_rg_multi_MPI -i input_rg_multi -m grdset -f -p $mpi -n $np $ww3 ww3_ts4" >> matrix.body
      echo "$rtst -s MPI -w work_ug_MPI       -i input_ug                 -f -p $mpi -n $np $ww3 ww3_ts4" >> matrix.body
-   else 
+   else
      echo "$rtst        -w work_rg_shel      -i input_rg_shel                              $ww3 ww3_ts4" >> matrix.body
      echo "$rtst        -w work_rg_multi     -i input_rg_multi -m grdset                   $ww3 ww3_ts4" >> matrix.body
      echo "$rtst        -w work_ug           -i input_ug                                   $ww3 ww3_ts4" >> matrix.body
    fi
  fi
 
- # Global unstructured grid and Unresolved Obstacles Source Term (UOST) 
+ # Global unstructured grid and Unresolved Obstacles Source Term (UOST)
  if [ "$uost" = 'y' ] && [ "$dist" = 'y' ]
  then
    echo ' ' >> matrix.body
@@ -2062,7 +2068,10 @@
    fi
  fi
 
- #Test of updating the restart spectra 
+
+
+
+ #Test of updating the restart spectra
  if [ "$assim" = 'y' ]
  then
    echo ' ' >> matrix.body
@@ -2082,7 +2091,7 @@
    echo "$rtst -s ST4 -w work_UPD6_U_cap -i input_UPD6_U_cap $ww3 ww3_ta1" >> matrix.body
   fi
 
- #Test of atmosphere, ocean, and ice coupling using OASIS 
+ #Test of atmosphere, ocean, and ice coupling using OASIS
  if [ "$oasis" = 'y' ] && [ "$dist" = 'y' ]
  then
    echo ' ' >> matrix.body
@@ -2204,15 +2213,15 @@
     fi
   fi
 
- #Test gint for restarts 
+ #Test gint for restarts
   if [ "$ufs" = 'y' ] && [ "$grib" = 'y' ]
   then
-    echo ' ' >> matrix.body    
+    echo ' ' >> matrix.body
     echo "$rtst -s MPI_OMPH -w work_c -m grdset_c -f -p $mpi -n $npl  -t $nth1 $ww3 ww3_ufs1.2"            >> matrix.body
     echo "mkdir -p ww3_ufs1.2/work_l"                                                                      >> matrix.body
     echo "cp ww3_ufs1.2/work_c/restart.hafsl ww3_ufs1.2/work_l/restart.hafsl"                              >> matrix.body
     echo "$rtst -s MPI_OMPH -w work_l -m grdset_l -f -p $mpi -n $npl  -t $nth1 $ww3 ww3_ufs1.2"            >> matrix.body
-  fi 
+  fi
 
 
  #GEFSv12 setup with ww3_multi and grib2 output
diff --git a/regtests/bin/matrix_cmake_ncep b/regtests/bin/matrix_cmake_ncep
index 19ce9c5e1..62ca6c497 100755
--- a/regtests/bin/matrix_cmake_ncep
+++ b/regtests/bin/matrix_cmake_ncep
@@ -203,6 +203,7 @@ EOF
   export      shwtr='y' # shallow water tests
   export      unstr='y' # unstructured grid tests
   export      pdlib='y' # unstr with pdlib for domain decomposition and implicit solver
+  export        lmp='y' # Langmuir mixing parameterization
   export      smcgr='y' # SMC grid test
   export        rtd='y' # Rotated pole test
   export     mudice='y' # Mud/Ice and wave interaction tests

From 0903907f293cb8fb33b3f3b324423f4d4f20ab5b Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Thu, 14 Sep 2023 19:03:04 +0000
Subject: [PATCH 5/5] ww3_tp2.22/input: clean out any files not needed for this
 test. also, update to ww3_grid

---
 regtests/ww3_tp2.22/input/switch              |  1 -
 regtests/ww3_tp2.22/input/switch_PR1          |  1 -
 regtests/ww3_tp2.22/input/switch_PR1_MPI      |  1 -
 regtests/ww3_tp2.22/input/switch_PR2_UNO      |  1 -
 regtests/ww3_tp2.22/input/switch_PR2_UNO_MPI  |  1 -
 regtests/ww3_tp2.22/input/switch_PR2_UQ       |  1 -
 regtests/ww3_tp2.22/input/switch_PR2_UQ_MPI   |  1 -
 .../ww3_tp2.22/input/switch_PR2_UQ_NC4_MPI    |  1 -
 regtests/ww3_tp2.22/input/switch_PR3_UNO      |  1 -
 regtests/ww3_tp2.22/input/switch_PR3_UNO_MPI  |  1 -
 regtests/ww3_tp2.22/input/switch_PR3_UQ       |  1 -
 regtests/ww3_tp2.22/input/ww3_grid.inp        |  4 +-
 regtests/ww3_tp2.22/input/ww3_grid.nml        | 83 -------------------
 regtests/ww3_tp2.22/input/ww3_grid_nocmpr.inp | 35 --------
 regtests/ww3_tp2.22/input/ww3_grid_nocmpr.nml | 83 -------------------
 15 files changed, 2 insertions(+), 214 deletions(-)
 delete mode 100644 regtests/ww3_tp2.22/input/switch
 delete mode 100644 regtests/ww3_tp2.22/input/switch_PR1
 delete mode 100644 regtests/ww3_tp2.22/input/switch_PR1_MPI
 delete mode 100644 regtests/ww3_tp2.22/input/switch_PR2_UNO
 delete mode 100644 regtests/ww3_tp2.22/input/switch_PR2_UNO_MPI
 delete mode 100644 regtests/ww3_tp2.22/input/switch_PR2_UQ
 delete mode 100644 regtests/ww3_tp2.22/input/switch_PR2_UQ_MPI
 delete mode 100644 regtests/ww3_tp2.22/input/switch_PR2_UQ_NC4_MPI
 delete mode 100644 regtests/ww3_tp2.22/input/switch_PR3_UNO
 delete mode 100644 regtests/ww3_tp2.22/input/switch_PR3_UNO_MPI
 delete mode 100644 regtests/ww3_tp2.22/input/switch_PR3_UQ
 delete mode 100644 regtests/ww3_tp2.22/input/ww3_grid.nml
 delete mode 100644 regtests/ww3_tp2.22/input/ww3_grid_nocmpr.inp
 delete mode 100644 regtests/ww3_tp2.22/input/ww3_grid_nocmpr.nml

diff --git a/regtests/ww3_tp2.22/input/switch b/regtests/ww3_tp2.22/input/switch
deleted file mode 100644
index 9a795bd35..000000000
--- a/regtests/ww3_tp2.22/input/switch
+++ /dev/null
@@ -1 +0,0 @@
-NOGRB SHRD PR3 UQ FLX2 LN0 ST0 NL0 BT0 DB0 TR0 BS0 IC0 IS0 REF0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7 O10 O11
diff --git a/regtests/ww3_tp2.22/input/switch_PR1 b/regtests/ww3_tp2.22/input/switch_PR1
deleted file mode 100644
index ca2e4ceb1..000000000
--- a/regtests/ww3_tp2.22/input/switch_PR1
+++ /dev/null
@@ -1 +0,0 @@
-NOGRB SHRD PR1 FLX2 LN0 ST0 NL0 BT0 DB0 TR0 BS0 IC0 IS0 REF0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7 O10 O11
diff --git a/regtests/ww3_tp2.22/input/switch_PR1_MPI b/regtests/ww3_tp2.22/input/switch_PR1_MPI
deleted file mode 100644
index bc7a812fe..000000000
--- a/regtests/ww3_tp2.22/input/switch_PR1_MPI
+++ /dev/null
@@ -1 +0,0 @@
-NOGRB DIST MPI PR1 FLX2 LN0 ST0 NL0 BT0 DB0 TR0 BS0 IC0 IS0 REF0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7 O10 O11
diff --git a/regtests/ww3_tp2.22/input/switch_PR2_UNO b/regtests/ww3_tp2.22/input/switch_PR2_UNO
deleted file mode 100644
index 69bb8a2f8..000000000
--- a/regtests/ww3_tp2.22/input/switch_PR2_UNO
+++ /dev/null
@@ -1 +0,0 @@
-NOGRB SHRD PR2 UNO FLX2 LN0 ST0 NL0 BT0 DB0 TR0 BS0 IC0 IS0 REF0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7 O10 O11
diff --git a/regtests/ww3_tp2.22/input/switch_PR2_UNO_MPI b/regtests/ww3_tp2.22/input/switch_PR2_UNO_MPI
deleted file mode 100644
index 489a84f90..000000000
--- a/regtests/ww3_tp2.22/input/switch_PR2_UNO_MPI
+++ /dev/null
@@ -1 +0,0 @@
-NOGRB DIST MPI PR2 UNO FLX2 LN0 ST0 NL0 BT0 DB0 TR0 BS0 IC0 IS0 REF0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7 O10 O11
diff --git a/regtests/ww3_tp2.22/input/switch_PR2_UQ b/regtests/ww3_tp2.22/input/switch_PR2_UQ
deleted file mode 100644
index ebf7cf190..000000000
--- a/regtests/ww3_tp2.22/input/switch_PR2_UQ
+++ /dev/null
@@ -1 +0,0 @@
-NOGRB SHRD PR2 UQ FLX2 LN0 ST0 NL0 BT0 DB0 TR0 BS0 IC0 IS0 REF0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7 O10 O11
diff --git a/regtests/ww3_tp2.22/input/switch_PR2_UQ_MPI b/regtests/ww3_tp2.22/input/switch_PR2_UQ_MPI
deleted file mode 100644
index 32cfed954..000000000
--- a/regtests/ww3_tp2.22/input/switch_PR2_UQ_MPI
+++ /dev/null
@@ -1 +0,0 @@
-NOGRB DIST MPI PR2 UQ FLX2 LN0 ST0 NL0 BT0 DB0 TR0 BS0 IC0 IS0 REF0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7 O10 O11
diff --git a/regtests/ww3_tp2.22/input/switch_PR2_UQ_NC4_MPI b/regtests/ww3_tp2.22/input/switch_PR2_UQ_NC4_MPI
deleted file mode 100644
index 32cfed954..000000000
--- a/regtests/ww3_tp2.22/input/switch_PR2_UQ_NC4_MPI
+++ /dev/null
@@ -1 +0,0 @@
-NOGRB DIST MPI PR2 UQ FLX2 LN0 ST0 NL0 BT0 DB0 TR0 BS0 IC0 IS0 REF0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7 O10 O11
diff --git a/regtests/ww3_tp2.22/input/switch_PR3_UNO b/regtests/ww3_tp2.22/input/switch_PR3_UNO
deleted file mode 100644
index 8baffa623..000000000
--- a/regtests/ww3_tp2.22/input/switch_PR3_UNO
+++ /dev/null
@@ -1 +0,0 @@
-NOGRB SHRD PR3 UNO FLX2 LN0 ST0 NL0 BT0 DB0 TR0 BS0 IC0 IS0 REF0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7 O10 O11
diff --git a/regtests/ww3_tp2.22/input/switch_PR3_UNO_MPI b/regtests/ww3_tp2.22/input/switch_PR3_UNO_MPI
deleted file mode 100644
index 35ca7863d..000000000
--- a/regtests/ww3_tp2.22/input/switch_PR3_UNO_MPI
+++ /dev/null
@@ -1 +0,0 @@
-NOGRB DIST MPI PR3 UNO FLX2 LN0 ST0 NL0 BT0 DB0 TR0 BS0 IC0 IS0 REF0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7 O10 O11
diff --git a/regtests/ww3_tp2.22/input/switch_PR3_UQ b/regtests/ww3_tp2.22/input/switch_PR3_UQ
deleted file mode 100644
index 9a795bd35..000000000
--- a/regtests/ww3_tp2.22/input/switch_PR3_UQ
+++ /dev/null
@@ -1 +0,0 @@
-NOGRB SHRD PR3 UQ FLX2 LN0 ST0 NL0 BT0 DB0 TR0 BS0 IC0 IS0 REF0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7 O10 O11
diff --git a/regtests/ww3_tp2.22/input/ww3_grid.inp b/regtests/ww3_tp2.22/input/ww3_grid.inp
index aec6060e9..4b04a1022 100644
--- a/regtests/ww3_tp2.22/input/ww3_grid.inp
+++ b/regtests/ww3_tp2.22/input/ww3_grid.inp
@@ -1,6 +1,6 @@
 $ WAVEWATCH III Grid preprocessor input file
 $ ------------------------------------------
-  '2-D PROPAGATION AROUND GLOBE  '
+  '2-D PROP. AROUND GLOBE WITH LANGMUIR MIXING PARAMETERIZATION'
 $
    1.1 0.040 9  24  0.
 $
@@ -11,7 +11,7 @@ $ &PRO2 DTIME = 0. /
   &PRO2 DTIME = 345600. /
 $ &PRO3 WDTHCG = 0.,   WDTHTH = 0. /
   &PRO3 WDTHCG = 1.50, WDTHTH =1.50 /
-  &OUTS E3D = 1 / 
+  &OUTS E3D = 1 /
   &LMPN LMPENABLED = T, SDTAIL = T, HSLMODE = 0 /
 END OF NAMELISTS
 $
diff --git a/regtests/ww3_tp2.22/input/ww3_grid.nml b/regtests/ww3_tp2.22/input/ww3_grid.nml
deleted file mode 100644
index 2a10b4424..000000000
--- a/regtests/ww3_tp2.22/input/ww3_grid.nml
+++ /dev/null
@@ -1,83 +0,0 @@
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - ww3_grid.nml - Grid pre-processing                   !
-! -------------------------------------------------------------------- !
-
-! -------------------------------------------------------------------- !
-! Define the spectrum parameterization via SPECTRUM_NML namelist
-! -------------------------------------------------------------------- !
-&SPECTRUM_NML
-  SPECTRUM%XFR       =  1.1
-  SPECTRUM%FREQ1     =  0.040
-  SPECTRUM%NK        =  9
-  SPECTRUM%NTH       =  24
-/
-
-! -------------------------------------------------------------------- !
-! Define the run parameterization via RUN_NML namelist
-! -------------------------------------------------------------------- !
-&RUN_NML
-  RUN%FLCX         =  T
-  RUN%FLCY         =  T
-  RUN%FLCTH        =  T
-/
-
-! -------------------------------------------------------------------- !
-! Define the timesteps parameterization via TIMESTEPS_NML namelist
-! -------------------------------------------------------------------- !
-&TIMESTEPS_NML
-  TIMESTEPS%DTMAX        =  2200.
-  TIMESTEPS%DTXY         =  2200.
-  TIMESTEPS%DTKTH        =  2200.
-  TIMESTEPS%DTMIN        =  2200.
-/
-
-! -------------------------------------------------------------------- !
-! Define the grid to preprocess via GRID_NML namelist
-! -------------------------------------------------------------------- !
-&GRID_NML
-  GRID%NAME         =  '2-D PROPAGATION AROUND GLOBE'
-  GRID%NML          =  '../input/namelists_2-D.nml'
-  GRID%TYPE         =  'RECT'
-  GRID%COORD        =  'SPHE'
-  GRID%CLOS         =  'NONE'
-  GRID%ZLIM         =  -5.
-  GRID%DMIN         =  5.75
-/
-
-! -------------------------------------------------------------------- !
-! Define the rectilinear grid type via RECT_NML namelist
-! -------------------------------------------------------------------- !
-&RECT_NML
-  RECT%NX           =  193
-  RECT%NY           =  93
-  RECT%SX           =  1.
-  RECT%SY           =  1.
-  RECT%X0           =  -6.
-  RECT%Y0           =  -46.
-/
-
-! -------------------------------------------------------------------- !
-! Define the depth to preprocess via DEPTH_NML namelist
-! -------------------------------------------------------------------- !
-&DEPTH_NML
-  DEPTH%SF        =  -2500.
-  DEPTH%FILENAME  =  '../input/2-D.depth'
-  DEPTH%IDLA      =  2
-/
-
-! -------------------------------------------------------------------- !
-! Define the output boundary points via OUTBND_COUNT_NML and
-!                                       OUTBND_LINE_NML namelist
-! -------------------------------------------------------------------- !
-&OUTBND_COUNT_NML
-  OUTBND_COUNT%N_LINE   =  2
-/
-
-&OUTBND_LINE_NML
-  OUTBND_LINE(1)           =  0. -40. 0.5 0.866 100
-  OUTBND_LINE(2)           =  0. 40. 0.5 -0.866 -100
-/
-
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - end of namelist                                      !
-! -------------------------------------------------------------------- !
diff --git a/regtests/ww3_tp2.22/input/ww3_grid_nocmpr.inp b/regtests/ww3_tp2.22/input/ww3_grid_nocmpr.inp
deleted file mode 100644
index 4936ff3f7..000000000
--- a/regtests/ww3_tp2.22/input/ww3_grid_nocmpr.inp
+++ /dev/null
@@ -1,35 +0,0 @@
-$ WAVEWATCH III Grid preprocessor input file
-$ ------------------------------------------
-  '2-D PROPAGATION AROUND GLOBE  '
-$
-   1.1 0.040 9  24  0.
-$
-   F T T T F F
-  2200.  2200. 2200.  2200.
-$
-$ &PRO2 DTIME = 0. /
-  &PRO2 DTIME = 345600. /
-$ &PRO3 WDTHCG = 0.,   WDTHTH = 0. /
-  &PRO3 WDTHCG = 1.50, WDTHTH =1.50 /
-  &OUTS E3D = 1 / 
-  &MISC TRCKCMPR = F / 
-END OF NAMELISTS
-$
-  'RECT' T 'NONE'
-  193   93
-    1.   1.  1.
-   -6. -46.  1.
-$
-  -5. 5.75  10  -2500. 2 1 '(....)' 'UNIT' 'input'
-$
-   17949*1
-$
-  10  1 1 '(....)' 'PART' 'input'
-$
-   0  0  F
-   0  0  F
-   0  0
-$
-   0. -40.  0.5  0.866  100
-   0.  40.  0.5 -0.866 -100
-   0. 0. 0. 0.  0
diff --git a/regtests/ww3_tp2.22/input/ww3_grid_nocmpr.nml b/regtests/ww3_tp2.22/input/ww3_grid_nocmpr.nml
deleted file mode 100644
index 11c07ad3c..000000000
--- a/regtests/ww3_tp2.22/input/ww3_grid_nocmpr.nml
+++ /dev/null
@@ -1,83 +0,0 @@
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - ww3_grid.nml - Grid pre-processing                   !
-! -------------------------------------------------------------------- !
-
-! -------------------------------------------------------------------- !
-! Define the spectrum parameterization via SPECTRUM_NML namelist
-! -------------------------------------------------------------------- !
-&SPECTRUM_NML
-  SPECTRUM%XFR       =  1.1
-  SPECTRUM%FREQ1     =  0.040
-  SPECTRUM%NK        =  9
-  SPECTRUM%NTH       =  24
-/
-
-! -------------------------------------------------------------------- !
-! Define the run parameterization via RUN_NML namelist
-! -------------------------------------------------------------------- !
-&RUN_NML
-  RUN%FLCX         =  T
-  RUN%FLCY         =  T
-  RUN%FLCTH        =  T
-/
-
-! -------------------------------------------------------------------- !
-! Define the timesteps parameterization via TIMESTEPS_NML namelist
-! -------------------------------------------------------------------- !
-&TIMESTEPS_NML
-  TIMESTEPS%DTMAX        =  2200.
-  TIMESTEPS%DTXY         =  2200.
-  TIMESTEPS%DTKTH        =  2200.
-  TIMESTEPS%DTMIN        =  2200.
-/
-
-! -------------------------------------------------------------------- !
-! Define the grid to preprocess via GRID_NML namelist
-! -------------------------------------------------------------------- !
-&GRID_NML
-  GRID%NAME         =  '2-D PROPAGATION AROUND GLOBE'
-  GRID%NML          =  '../input/namelists_nocmpr.nml'
-  GRID%TYPE         =  'RECT'
-  GRID%COORD        =  'SPHE'
-  GRID%CLOS         =  'NONE'
-  GRID%ZLIM         =  -5.
-  GRID%DMIN         =  5.75
-/
-
-! -------------------------------------------------------------------- !
-! Define the rectilinear grid type via RECT_NML namelist
-! -------------------------------------------------------------------- !
-&RECT_NML
-  RECT%NX           =  193
-  RECT%NY           =  93
-  RECT%SX           =  1.
-  RECT%SY           =  1.
-  RECT%X0           =  -6.
-  RECT%Y0           =  -46.
-/
-
-! -------------------------------------------------------------------- !
-! Define the depth to preprocess via DEPTH_NML namelist
-! -------------------------------------------------------------------- !
-&DEPTH_NML
-  DEPTH%SF        =  -2500.
-  DEPTH%FILENAME  =  '../input/nocmpr.depth'
-  DEPTH%IDLA      =  2
-/
-
-! -------------------------------------------------------------------- !
-! Define the output boundary points via OUTBND_COUNT_NML and
-!                                       OUTBND_LINE_NML namelist
-! -------------------------------------------------------------------- !
-&OUTBND_COUNT_NML
-  OUTBND_COUNT%N_LINE   =  2
-/
-
-&OUTBND_LINE_NML
-  OUTBND_LINE(1)           =  0. -40. 0.5 0.866 100
-  OUTBND_LINE(2)           =  0. 40. 0.5 -0.866 -100
-/
-
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - end of namelist                                      !
-! -------------------------------------------------------------------- !