From f79e1565957fdd80f61b1cffb38329ea2472f843 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Fri, 20 Oct 2023 20:35:27 +0000
Subject: [PATCH 01/35] ww3_tp2.22/info: update for Stokes drift output
 variables.

---
 regtests/ww3_tp2.22/info | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/regtests/ww3_tp2.22/info b/regtests/ww3_tp2.22/info
index 576995848..7ebea70ff 100644
--- a/regtests/ww3_tp2.22/info
+++ b/regtests/ww3_tp2.22/info
@@ -40,6 +40,10 @@
 #     + switch_PR2_UQ_MPI                                                   #
 #     + switch_PR3_UNO_MPI                                                  #
 #     + switch_PR3_UQ_MPI                                                   #
+# - Test case output:
+#   * USSX/USSY:   surface Stokes drift
+#   * USSHX/USSHX: surface layer averaged Stokes drift
+#
 #                                                                           #
 #  Sample run_test commands :                                               #
 #   (Note: mpirun commands differ by local system)                          #

From 5b1a73afac53a1cb2d5494caa14ef16039577f98 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Wed, 25 Oct 2023 15:34:14 +0000
Subject: [PATCH 02/35] ww3_grid.inp: addresses clean up request for commented
 out code

---
 regtests/ww3_tp2.22/input/ww3_grid.inp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/regtests/ww3_tp2.22/input/ww3_grid.inp b/regtests/ww3_tp2.22/input/ww3_grid.inp
index 4b04a1022..9cdf683fe 100644
--- a/regtests/ww3_tp2.22/input/ww3_grid.inp
+++ b/regtests/ww3_tp2.22/input/ww3_grid.inp
@@ -7,9 +7,7 @@ $
    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 /
   &LMPN LMPENABLED = T, SDTAIL = T, HSLMODE = 0 /

From 8e7d8b2cdcd5c3fb01f9476c2c42881cdcb777d3 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Wed, 25 Oct 2023 21:37:54 +0000
Subject: [PATCH 03/35] ww3_tp2.22: *.nml removed

---
 regtests/ww3_tp2.22/input/namelists_2-D.nml   |  4 --
 .../ww3_tp2.22/input/namelists_nocmpr.nml     |  5 --
 regtests/ww3_tp2.22/input/ww3_multi.nml       | 57 ---------------
 regtests/ww3_tp2.22/input/ww3_ounf.nml        | 27 -------
 regtests/ww3_tp2.22/input/ww3_ounp.nml        | 46 ------------
 regtests/ww3_tp2.22/input/ww3_shel.nml        | 72 -------------------
 regtests/ww3_tp2.22/input/ww3_trnc.nml        | 21 ------
 7 files changed, 232 deletions(-)
 delete mode 100644 regtests/ww3_tp2.22/input/namelists_2-D.nml
 delete mode 100644 regtests/ww3_tp2.22/input/namelists_nocmpr.nml
 delete mode 100644 regtests/ww3_tp2.22/input/ww3_multi.nml
 delete mode 100644 regtests/ww3_tp2.22/input/ww3_ounf.nml
 delete mode 100644 regtests/ww3_tp2.22/input/ww3_ounp.nml
 delete mode 100644 regtests/ww3_tp2.22/input/ww3_shel.nml
 delete mode 100644 regtests/ww3_tp2.22/input/ww3_trnc.nml

diff --git a/regtests/ww3_tp2.22/input/namelists_2-D.nml b/regtests/ww3_tp2.22/input/namelists_2-D.nml
deleted file mode 100644
index 8abfad12c..000000000
--- a/regtests/ww3_tp2.22/input/namelists_2-D.nml
+++ /dev/null
@@ -1,4 +0,0 @@
-&PRO2 DTIME = 345600. /
-&PRO3 WDTHCG = 1.50, WDTHTH =1.50 /
-&OUTS E3D = 1 /
-END OF NAMELISTS
diff --git a/regtests/ww3_tp2.22/input/namelists_nocmpr.nml b/regtests/ww3_tp2.22/input/namelists_nocmpr.nml
deleted file mode 100644
index 9545826d2..000000000
--- a/regtests/ww3_tp2.22/input/namelists_nocmpr.nml
+++ /dev/null
@@ -1,5 +0,0 @@
-&PRO2 DTIME = 345600. /
-&PRO3 WDTHCG = 1.50, WDTHTH =1.50 /
-&OUTS E3D = 1 /
-&MISC TRCKCMPR = F /
-END OF NAMELISTS
diff --git a/regtests/ww3_tp2.22/input/ww3_multi.nml b/regtests/ww3_tp2.22/input/ww3_multi.nml
deleted file mode 100644
index 95c0f379c..000000000
--- a/regtests/ww3_tp2.22/input/ww3_multi.nml
+++ /dev/null
@@ -1,57 +0,0 @@
-! -------------------------------------------------------------------- !
-! WAVEWATCH III ww3_multi.nml - multi-grid model                       !
-! -------------------------------------------------------------------- !
-
-
-! -------------------------------------------------------------------- !
-! Define top-level model parameters via DOMAIN_NML namelist
-! -------------------------------------------------------------------- !
-&DOMAIN_NML
-  DOMAIN%FLGHG1 = T
-  DOMAIN%FLGHG2 = T
-  DOMAIN%STOP   = '19680618 000000'
-/
-
-! -------------------------------------------------------------------- !
-! Define each input grid via the INPUT_GRID_NML namelist
-! -------------------------------------------------------------------- !
-&INPUT_GRID_NML
-/
-
-! -------------------------------------------------------------------- !
-! Define each model grid via the MODEL_GRID_NML namelist
-! -------------------------------------------------------------------- !
-&MODEL_GRID_NML
-  MODEL(1)%NAME                  = 'ww3'
-/
-
-! -------------------------------------------------------------------- !
-! Define the output types point parameters via OUTPUT_TYPE_NML namelist
-! -------------------------------------------------------------------- !
-&OUTPUT_TYPE_NML
-  ALLTYPE%FIELD%LIST       = 'HS T0M1 DIR SPR'
-  ALLTYPE%POINT%FILE       = '../input/points.list'
-/
-
-! -------------------------------------------------------------------- !
-! Define output dates via OUTPUT_DATE_NML namelist
-! -------------------------------------------------------------------- !
-&OUTPUT_DATE_NML
-  ALLDATE%FIELD          = '19680606 000000' '86400' '19680618 000000'
-  ALLDATE%POINT          = '19680606 000000' '21600' '19680618 000000'
-  ALLDATE%TRACK          = '19680606 000000' '3600' '19680618 000000'
-  ALLDATE%BOUNDARY       = '19680606 000000' '3600' '19680618 000000'
-/
-
-! -------------------------------------------------------------------- !
-! Define homogeneous input via HOMOG_COUNT_NML and HOMOG_INPUT_NML namelist
-! -------------------------------------------------------------------- !
-&HOMOG_COUNT_NML
-/
-
-&HOMOG_INPUT_NML
-/
-
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - end of namelist                                      !
-! -------------------------------------------------------------------- !
diff --git a/regtests/ww3_tp2.22/input/ww3_ounf.nml b/regtests/ww3_tp2.22/input/ww3_ounf.nml
deleted file mode 100644
index 44db63521..000000000
--- a/regtests/ww3_tp2.22/input/ww3_ounf.nml
+++ /dev/null
@@ -1,27 +0,0 @@
-! -------------------------------------------------------------------- !
-! WAVEWATCH III ww3_ounf.nml - Grid output post-processing             !
-! -------------------------------------------------------------------- !
-
-! -------------------------------------------------------------------- !
-! Define the output fields to postprocess via FIELD_NML namelist
-! -------------------------------------------------------------------- !
-&FIELD_NML
-  FIELD%TIMESTART        =  '19680606 000000'
-  FIELD%TIMESTRIDE       =  '10800.'
-  FIELD%TIMECOUNT        =  '100'
-  FIELD%LIST             =  'HS T01 DIR SPR'
-  FIELD%PARTITION        =  '0 1 2'
-  FIELD%TYPE             =  4
-/
-
-! -------------------------------------------------------------------- !
-! Define the content of the output file via FILE_NML namelist
-! -------------------------------------------------------------------- !
-&FILE_NML
-  FILE%IXN           = 100000
-  FILE%IYN           = 100000
-/
-
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - end of namelist                                      !
-! -------------------------------------------------------------------- !
diff --git a/regtests/ww3_tp2.22/input/ww3_ounp.nml b/regtests/ww3_tp2.22/input/ww3_ounp.nml
deleted file mode 100644
index 29fa1897d..000000000
--- a/regtests/ww3_tp2.22/input/ww3_ounp.nml
+++ /dev/null
@@ -1,46 +0,0 @@
-! -------------------------------------------------------------------- !
-! WAVEWATCH III ww3_ounp.nml - Point output post-processing            !
-! -------------------------------------------------------------------- !
-
-! -------------------------------------------------------------------- !
-! Define the output fields to postprocess via POINT_NML namelist
-! -------------------------------------------------------------------- !
-&POINT_NML
-  POINT%TIMESTART        =  '19680606 000000'
-  POINT%TIMESTRIDE       =  '21600.'
-  POINT%TIMECOUNT        =  '1000'
-  POINT%LIST             =  '1 2 3'
-/
-
-! -------------------------------------------------------------------- !
-! Define the content of the output file via FILE_NML namelist
-! -------------------------------------------------------------------- !
-&FILE_NML
-/
-
-! -------------------------------------------------------------------- !
-! Define the type 0, inventory of file
-! -------------------------------------------------------------------- !
-
-
-! -------------------------------------------------------------------- !
-! Define the type 1, spectra via SPECTRA_NML namelist
-! -------------------------------------------------------------------- !
-&SPECTRA_NML
-/
-
-! -------------------------------------------------------------------- !
-! Define the type 2, mean parameter via PARAM_NML namelist
-! -------------------------------------------------------------------- !
-&PARAM_NML
-/
-
-! -------------------------------------------------------------------- !
-! Define the type 3, source terms via SOURCE_NML namelist
-! -------------------------------------------------------------------- !
-&SOURCE_NML
-/
-
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - end of namelist                                      !
-! -------------------------------------------------------------------- !
diff --git a/regtests/ww3_tp2.22/input/ww3_shel.nml b/regtests/ww3_tp2.22/input/ww3_shel.nml
deleted file mode 100644
index 578f05f93..000000000
--- a/regtests/ww3_tp2.22/input/ww3_shel.nml
+++ /dev/null
@@ -1,72 +0,0 @@
-! -------------------------------------------------------------------- !
-! WAVEWATCH III ww3_shel.nml - single-grid model                       !
-! -------------------------------------------------------------------- !
-
-
-! -------------------------------------------------------------------- !
-! Define top-level model parameters via DOMAIN_NML namelist
-! -------------------------------------------------------------------- !
-&DOMAIN_NML
-  DOMAIN%STOP    = '19680606 120000'
-/
-
-! -------------------------------------------------------------------- !
-! Define each forcing via the INPUT_NML namelist
-! -------------------------------------------------------------------- !
-&INPUT_NML
-  INPUT%FORCING%CURRENTS      = 'H'
-  INPUT%FORCING%WINDS         = 'H'
-/
-
-! -------------------------------------------------------------------- !
-! Define the output types point parameters via OUTPUT_TYPE_NML namelist
-! -------------------------------------------------------------------- !
-&OUTPUT_TYPE_NML
-  TYPE%FIELD%LIST          = 'HS EF T01 DIR SPR'
-  TYPE%POINT%FILE          = '../input/points.list'
-/
-
-! -------------------------------------------------------------------- !
-! Define output dates via OUTPUT_DATE_NML namelist
-! -------------------------------------------------------------------- !
-&OUTPUT_DATE_NML
-  DATE%FIELD          = '19680606 000000' '10800' '19680608 000000'
-  DATE%POINT          = '19680606 000000' '21600' '19680608 000000'
-  DATE%TRACK          = '19680606 000000' '14400' '19680608 000000'
-/
-
-! -------------------------------------------------------------------- !
-! Define homogeneous input via HOMOG_COUNT_NML and HOMOG_INPUT_NML namelist
-! -------------------------------------------------------------------- !
-&HOMOG_COUNT_NML
-  HOMOG_COUNT%N_CUR                =  1
-  HOMOG_COUNT%N_WND                =  3
-/
-
-&HOMOG_INPUT_NML
-  HOMOG_INPUT(1)%NAME        = 'CUR'
-  HOMOG_INPUT(1)%DATE        = '19680606 030000'
-  HOMOG_INPUT(1)%VALUE1      = 2.0
-  HOMOG_INPUT(1)%VALUE2      = 45.
-
-  HOMOG_INPUT(2)%NAME        = 'WND'
-  HOMOG_INPUT(2)%VALUE1      = 20.0
-  HOMOG_INPUT(2)%VALUE2      = 180.
-  HOMOG_INPUT(2)%VALUE3      = 2.
-
-  HOMOG_INPUT(3)%NAME        = 'WND'
-  HOMOG_INPUT(3)%DATE        = '19680606 040000'
-  HOMOG_INPUT(3)%VALUE1      = 15.0
-  HOMOG_INPUT(3)%VALUE2      = 130.
-  HOMOG_INPUT(3)%VALUE3      = 1.
-
-  HOMOG_INPUT(4)%NAME        = 'WND'
-  HOMOG_INPUT(4)%DATE        = '19680606 080000'
-  HOMOG_INPUT(4)%VALUE1      = 25.0
-  HOMOG_INPUT(4)%VALUE2      = 90.
-  HOMOG_INPUT(4)%VALUE3      = 3.
-/
-
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - end of namelist                                      !
-! -------------------------------------------------------------------- !
diff --git a/regtests/ww3_tp2.22/input/ww3_trnc.nml b/regtests/ww3_tp2.22/input/ww3_trnc.nml
deleted file mode 100644
index e4ae8ceab..000000000
--- a/regtests/ww3_tp2.22/input/ww3_trnc.nml
+++ /dev/null
@@ -1,21 +0,0 @@
-! -------------------------------------------------------------------- !
-! WAVEWATCH III ww3_trnc.nml - Track output post-processing            !
-! -------------------------------------------------------------------- !
-
-! -------------------------------------------------------------------- !
-! Define the output fields to postprocess via TRACK_NML namelist
-! -------------------------------------------------------------------- !
-&TRACK_NML
-  TRACK%TIMESTART        =  '19680606 000000'
-  TRACK%TIMESTRIDE       =  '3600.'
-/
-
-! -------------------------------------------------------------------- !
-! Define the content of the input file via FILE_NML namelist
-! -------------------------------------------------------------------- !
-&FILE_NML
-/
-
-! -------------------------------------------------------------------- !
-! WAVEWATCH III - end of namelist                                      !
-! -------------------------------------------------------------------- !

From dd89cfe7e7be7cbfc6abbebc3b901cd6e26f9faf Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Wed, 25 Oct 2023 21:39:17 +0000
Subject: [PATCH 04/35] ww3_tp2.22: removed ww3_multi.inp

---
 regtests/ww3_tp2.22/input/ww3_multi.inp | 31 -------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 regtests/ww3_tp2.22/input/ww3_multi.inp

diff --git a/regtests/ww3_tp2.22/input/ww3_multi.inp b/regtests/ww3_tp2.22/input/ww3_multi.inp
deleted file mode 100644
index 4d5d699e6..000000000
--- a/regtests/ww3_tp2.22/input/ww3_multi.inp
+++ /dev/null
@@ -1,31 +0,0 @@
-$ WAVEWATCH III multi-scale input file
-$ ------------------------------
-  1 0 F 1 F F
-$
-  'ww3' 'no' 'no' 'no' 'no' 'no' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F
-$
-   19680606 000000 19680618 000000
-$
-   T  T
-$
-   19680606 000000  86400  19680618 000000
-$
- N
- HS T0M1 DIR SPR
-$
-   19680606 000000  21600  19680618 000000
-     0.0   0.0   'LEFT'
-    90.0   0.0   'CENTER'
-   180.0   0.0   'RIGHT'
-     0.0   0.0   'STOPSTRING'
-   19680606 000000   3600  19680618 000000
-   T
-   19680612 000000      0  19680612 000000
-   19680606 000000   3600  19680618 000000
-   19680612 000000      0  19680612 000000
-$
-  'the_end'  0
-$
-  'STP'
-$
-$ End of input file

From 63ac370aa8efe3e5e3560acdb393600a9080ebee Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Wed, 25 Oct 2023 21:47:31 +0000
Subject: [PATCH 05/35] ww3_tp2.22: removed - nocmpr.depth, points.list. dont
 believe they are necessary

---
 regtests/ww3_tp2.22/input/nocmpr.depth | 1 -
 regtests/ww3_tp2.22/input/points.list  | 3 ---
 2 files changed, 4 deletions(-)
 delete mode 100644 regtests/ww3_tp2.22/input/nocmpr.depth
 delete mode 100644 regtests/ww3_tp2.22/input/points.list

diff --git a/regtests/ww3_tp2.22/input/nocmpr.depth b/regtests/ww3_tp2.22/input/nocmpr.depth
deleted file mode 100644
index e3dcb6b06..000000000
--- a/regtests/ww3_tp2.22/input/nocmpr.depth
+++ /dev/null
@@ -1 +0,0 @@
-17949*1
diff --git a/regtests/ww3_tp2.22/input/points.list b/regtests/ww3_tp2.22/input/points.list
deleted file mode 100644
index 30197c2ef..000000000
--- a/regtests/ww3_tp2.22/input/points.list
+++ /dev/null
@@ -1,3 +0,0 @@
-0.0 0.0 'LEFT'
-90.0 0.0 'CENTER'
-180.0 0.0 'RIGHT'

From 0a9e5471a6ed9d7f34bcd5f3014ca56a5becced6 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Wed, 25 Oct 2023 21:49:31 +0000
Subject: [PATCH 06/35] ww3_tp2.22: removed - 2-D.depth. dont believe it is
 necessary.

---
 regtests/ww3_tp2.22/input/2-D.depth | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 regtests/ww3_tp2.22/input/2-D.depth

diff --git a/regtests/ww3_tp2.22/input/2-D.depth b/regtests/ww3_tp2.22/input/2-D.depth
deleted file mode 100644
index e3dcb6b06..000000000
--- a/regtests/ww3_tp2.22/input/2-D.depth
+++ /dev/null
@@ -1 +0,0 @@
-17949*1

From 670d1f22ec2c79ac76ec2e4af9c7040657d50bba Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Wed, 25 Oct 2023 21:50:42 +0000
Subject: [PATCH 07/35] ww3_tp2.22: removed ww3_trck.inp, ww3_trnc.inp. dont
 believe they are necessary.

---
 regtests/ww3_tp2.22/input/ww3_trck.inp | 11 -----------
 regtests/ww3_tp2.22/input/ww3_trnc.inp | 20 --------------------
 2 files changed, 31 deletions(-)
 delete mode 100755 regtests/ww3_tp2.22/input/ww3_trck.inp
 delete mode 100755 regtests/ww3_tp2.22/input/ww3_trnc.inp

diff --git a/regtests/ww3_tp2.22/input/ww3_trck.inp b/regtests/ww3_tp2.22/input/ww3_trck.inp
deleted file mode 100755
index 6610b6085..000000000
--- a/regtests/ww3_tp2.22/input/ww3_trck.inp
+++ /dev/null
@@ -1,11 +0,0 @@
-$ -------------------------------------------------------------------- $
-$ WAVEWATCH III Track output post-processing                           $
-$--------------------------------------------------------------------- $
-$ The number of wavenumbers and directions need to be read in as they
-$                        determine the record length of the data file
-$
-  9 24
-$
-$ -------------------------------------------------------------------- $
-$ End of input file                                                    $
-$ -------------------------------------------------------------------- $
diff --git a/regtests/ww3_tp2.22/input/ww3_trnc.inp b/regtests/ww3_tp2.22/input/ww3_trnc.inp
deleted file mode 100755
index df60800b8..000000000
--- a/regtests/ww3_tp2.22/input/ww3_trnc.inp
+++ /dev/null
@@ -1,20 +0,0 @@
-$ -------------------------------------------------------------------- $
-$ WAVEWATCH III Track output post-processing                           $
-$--------------------------------------------------------------------- $
-$ First output time (yyyymmdd hhmmss), increment of output (s),
-$ and number of output times.
-$
-  19680606 000000  3600.  100000
-$
-$ Output type -------------------------------------------------------- $
-$ netCDF version [3,4]
-$ file prefix
-$ number of characters in date [4(yearly),6(monthly),8(daily),10(hourly)]
-$
- 3
- ww3.
- 6 
-$
-$ -------------------------------------------------------------------- $
-$ End of input file                                                    $
-$ -------------------------------------------------------------------- $

From 3f55d26920565bdea3885abca415a2736a6840b7 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Fri, 27 Oct 2023 15:25:04 +0000
Subject: [PATCH 08/35] ww3_grid.inp: update desc string

---
 regtests/ww3_tp2.22/input/ww3_grid.inp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regtests/ww3_tp2.22/input/ww3_grid.inp b/regtests/ww3_tp2.22/input/ww3_grid.inp
index 9cdf683fe..e021a094a 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 PROP. AROUND GLOBE WITH LANGMUIR MIXING PARAMETERIZATION'
+  'LANGMUIR MIXING PARAMETERIZATION FOR 2-D PROP. AROUND GLOBE'
 $
    1.1 0.040 9  24  0.
 $

From 0bb8e11f9d522555f61b01f3d9efa68a18ef1a50 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Fri, 27 Oct 2023 15:59:02 +0000
Subject: [PATCH 09/35] ww3_shel.inp: add output request for USSX/Y

---
 regtests/ww3_tp2.22/input/ww3_shel.inp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regtests/ww3_tp2.22/input/ww3_shel.inp b/regtests/ww3_tp2.22/input/ww3_shel.inp
index aba7af3e4..64232ed6a 100644
--- a/regtests/ww3_tp2.22/input/ww3_shel.inp
+++ b/regtests/ww3_tp2.22/input/ww3_shel.inp
@@ -18,7 +18,7 @@ $
    19680606 000000  10800  19680608 000000
 $
   N
-  HS EF  T01 DIR SPR
+  HS EF T01 DIR SPR USSX USSY
 $
    19680606 000000  21600  19680608 000000
      0.0   0.0   'LEFT'

From 86873adbb20061b930f8d28fadaa22bdd6ff1c2a Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Fri, 27 Oct 2023 17:18:50 +0000
Subject: [PATCH 10/35] ww3_tp2.22: *.inp updates for USSX/Y

---
 regtests/ww3_tp2.22/input/gx_outf.inp  | 3 +--
 regtests/ww3_tp2.22/input/ww3_ounf.inp | 6 +++---
 regtests/ww3_tp2.22/input/ww3_outf.inp | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/regtests/ww3_tp2.22/input/gx_outf.inp b/regtests/ww3_tp2.22/input/gx_outf.inp
index 770759ae9..719869826 100644
--- a/regtests/ww3_tp2.22/input/gx_outf.inp
+++ b/regtests/ww3_tp2.22/input/gx_outf.inp
@@ -5,7 +5,6 @@ $
   F F F F F  T F F T F  F F F F F  F F F F F  F F F F F F  F F F F F  F
 $
   N
-  HS  T01  DIR SPR
+  HS T01 DIR SPR USSX USSY
 $
   1 193 1 93  T T
-
diff --git a/regtests/ww3_tp2.22/input/ww3_ounf.inp b/regtests/ww3_tp2.22/input/ww3_ounf.inp
index 1d901574c..1c7078ab5 100644
--- a/regtests/ww3_tp2.22/input/ww3_ounf.inp
+++ b/regtests/ww3_tp2.22/input/ww3_ounf.inp
@@ -1,7 +1,7 @@
 $ -------------------------------------------------------------------- $
 $ WAVEWATCH III Grid output post-processing                            $
 $--------------------------------------------------------------------- $
-$ First output time (yyyymmdd hhmmss), increment of output (s), 
+$ First output time (yyyymmdd hhmmss), increment of output (s),
 $ and number of output times.
 $
   19680606 000000 10800. 100
@@ -13,13 +13,13 @@ $ file for a full documentation of field output options. Namelist type
 $ selection is used here (for alternative F/T flags, see ww3_shel.inp).
 $
  N
- HS T01 DIR SPR
+ HS T01 DIR SPR USSX USSY
 $
 $--------------------------------------------------------------------- $
 $ netCDF version [3,4]
 $        and variable type 4 [2 = SHORT, 3 = it depends , 4 = REAL]
 $ swell partitions [0 1 2 3 4 5]
-$ variables in same file [T] or not [F] 
+$ variables in same file [T] or not [F]
 $
  3 4
  0 1 2
diff --git a/regtests/ww3_tp2.22/input/ww3_outf.inp b/regtests/ww3_tp2.22/input/ww3_outf.inp
index 4b062a870..d7d17f0df 100644
--- a/regtests/ww3_tp2.22/input/ww3_outf.inp
+++ b/regtests/ww3_tp2.22/input/ww3_outf.inp
@@ -3,7 +3,7 @@ $ -----------------------------------------
   19680612 000000 518400. 2
 $
   N
-  HS T01  DIR SPR
+  HS T01 DIR SPR USSX USSY
 $
   1 0
 $

From 500f6a49f0edb3f7237f9d90bfe046cf54aeeeaa Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Fri, 27 Oct 2023 17:43:43 +0000
Subject: [PATCH 11/35] ww3_tp2.22/*.inp: USSX/Y --> USS

---
 regtests/ww3_tp2.22/input/gx_outf.inp  | 2 +-
 regtests/ww3_tp2.22/input/ww3_ounf.inp | 2 +-
 regtests/ww3_tp2.22/input/ww3_outf.inp | 2 +-
 regtests/ww3_tp2.22/input/ww3_shel.inp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/regtests/ww3_tp2.22/input/gx_outf.inp b/regtests/ww3_tp2.22/input/gx_outf.inp
index 719869826..8d36f84f9 100644
--- a/regtests/ww3_tp2.22/input/gx_outf.inp
+++ b/regtests/ww3_tp2.22/input/gx_outf.inp
@@ -5,6 +5,6 @@ $
   F F F F F  T F F T F  F F F F F  F F F F F  F F F F F F  F F F F F  F
 $
   N
-  HS T01 DIR SPR USSX USSY
+  HS T01 DIR SPR USS
 $
   1 193 1 93  T T
diff --git a/regtests/ww3_tp2.22/input/ww3_ounf.inp b/regtests/ww3_tp2.22/input/ww3_ounf.inp
index 1c7078ab5..3a596fc03 100644
--- a/regtests/ww3_tp2.22/input/ww3_ounf.inp
+++ b/regtests/ww3_tp2.22/input/ww3_ounf.inp
@@ -13,7 +13,7 @@ $ file for a full documentation of field output options. Namelist type
 $ selection is used here (for alternative F/T flags, see ww3_shel.inp).
 $
  N
- HS T01 DIR SPR USSX USSY
+ HS T01 DIR SPR USS
 $
 $--------------------------------------------------------------------- $
 $ netCDF version [3,4]
diff --git a/regtests/ww3_tp2.22/input/ww3_outf.inp b/regtests/ww3_tp2.22/input/ww3_outf.inp
index d7d17f0df..c1d1a0811 100644
--- a/regtests/ww3_tp2.22/input/ww3_outf.inp
+++ b/regtests/ww3_tp2.22/input/ww3_outf.inp
@@ -3,7 +3,7 @@ $ -----------------------------------------
   19680612 000000 518400. 2
 $
   N
-  HS T01 DIR SPR USSX USSY
+  HS T01 DIR SPR USS
 $
   1 0
 $
diff --git a/regtests/ww3_tp2.22/input/ww3_shel.inp b/regtests/ww3_tp2.22/input/ww3_shel.inp
index 64232ed6a..1c25475a9 100644
--- a/regtests/ww3_tp2.22/input/ww3_shel.inp
+++ b/regtests/ww3_tp2.22/input/ww3_shel.inp
@@ -18,7 +18,7 @@ $
    19680606 000000  10800  19680608 000000
 $
   N
-  HS EF T01 DIR SPR USSX USSY
+  HS EF T01 DIR SPR USS
 $
    19680606 000000  21600  19680608 000000
      0.0   0.0   'LEFT'

From 58fef56e666f67230f613a1250015fa5834c9838 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Fri, 27 Oct 2023 19:23:36 +0000
Subject: [PATCH 12/35] ww3_tp2.22: info - typo for USSY

---
 regtests/ww3_tp2.22/info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regtests/ww3_tp2.22/info b/regtests/ww3_tp2.22/info
index 7ebea70ff..6059cc939 100644
--- a/regtests/ww3_tp2.22/info
+++ b/regtests/ww3_tp2.22/info
@@ -42,7 +42,7 @@
 #     + switch_PR3_UQ_MPI                                                   #
 # - Test case output:
 #   * USSX/USSY:   surface Stokes drift
-#   * USSHX/USSHX: surface layer averaged Stokes drift
+#   * USSHX/USSHY: surface layer averaged Stokes drift
 #
 #                                                                           #
 #  Sample run_test commands :                                               #

From 743044c2e9f2cd1d22a9dfc1c065be732f2a06d4 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Fri, 27 Oct 2023 19:25:42 +0000
Subject: [PATCH 13/35] ww3_tp2.22: remove gx_outf.inp, map2_2.gs. Looks like
 grads support is being dropped.

---
 regtests/ww3_tp2.22/input/gx_outf.inp |  10 --
 regtests/ww3_tp2.22/input/map2_2.gs   | 126 --------------------------
 2 files changed, 136 deletions(-)
 delete mode 100644 regtests/ww3_tp2.22/input/gx_outf.inp
 delete mode 100644 regtests/ww3_tp2.22/input/map2_2.gs

diff --git a/regtests/ww3_tp2.22/input/gx_outf.inp b/regtests/ww3_tp2.22/input/gx_outf.inp
deleted file mode 100644
index 8d36f84f9..000000000
--- a/regtests/ww3_tp2.22/input/gx_outf.inp
+++ /dev/null
@@ -1,10 +0,0 @@
-$ WAVEWATCH III Grid output post-processing (GrADS)
-$ -------------------------------------------------
-  19680606 000000 43200. 25
-$
-  F F F F F  T F F T F  F F F F F  F F F F F  F F F F F F  F F F F F  F
-$
-  N
-  HS T01 DIR SPR USS
-$
-  1 193 1 93  T T
diff --git a/regtests/ww3_tp2.22/input/map2_2.gs b/regtests/ww3_tp2.22/input/map2_2.gs
deleted file mode 100644
index d0a6e23b4..000000000
--- a/regtests/ww3_tp2.22/input/map2_2.gs
+++ /dev/null
@@ -1,126 +0,0 @@
-*
-* map2_2.gs    : GrADS wave heigt and mean direction for ww3_tp2.2
-* ----------------------------------------------------------------
-*              Data set with multiple times expected.
-*              Input from ww3.ctl ww3.grads
-*              Scripts used :
-*                 colorset.gs : Sets up shading colors
-*
-* General set up
-
-  'set display color white'
-  'clear'
-  'run colorset.gs'
-
-  gdate="yyyy/mm/dd"
-  '!date -u "+%Y/%m/%d" > tmp_grads_gdate'
-  result = read (tmp_grads_gdate)
-  gdate = sublin(result,2)
-  '!rm -f tmp_grads_gdate'
-
-* Get the data, loop through times ...
-
-  'open ww3'
-
-t = 1
-while ( t <= 13 )
-
-  'set t ' t
-
-  'query time'
-  gradsdate = subwrd(result,3)
-  test = substr ( gradsdate, 3, 1 )
-  if ( test='Z' )
-    year = substr ( gradsdate, 9, 4 )
-    mnth = substr ( gradsdate, 6, 3 )
-    day  = substr ( gradsdate, 4, 2 )
-    hour = substr ( gradsdate, 1, 2 )
-    min  = '00'
-  else
-    year = substr ( gradsdate, 12, 4 )
-    mnth = substr ( gradsdate, 9, 3 )
-    day  = substr ( gradsdate, 7, 2 )
-    hour = substr ( gradsdate, 1, 2 )
-    min  = substr ( gradsdate, 4, 2 )
-  endif
-
-  month= '??'
-  if (mnth='JAN'); month= '01'; endif;
-  if (mnth='FEB'); month= '02'; endif;
-  if (mnth='MAR'); month= '03'; endif;
-  if (mnth='APR'); month= '04'; endif;
-  if (mnth='MAY'); month= '05'; endif;
-  if (mnth='JUN'); month= '06'; endif;
-  if (mnth='JUL'); month= '07'; endif;
-  if (mnth='AUG'); month= '08'; endif;
-  if (mnth='SEP'); month= '09'; endif;
-  if (mnth='OCT'); month= '10'; endif;
-  if (mnth='NOV'); month= '11'; endif;
-  if (mnth='DEC'); month= '12'; endif;
-
-  vdate = year '/' month '/' day ' ' hour ':' min 'z'
-
-* Basic plot set up
-
-  'set grads off'
-  'set lon -5 185'
-  'set lat -45 45'
-  'set xlint 10'
-  'set ylint 10'
-  'set grid on 3 60'
-  'set mpdraw off'
-
-* 'set parea 1. 7.5 2.5 9.'
-  'set mproj latlon'
-
-* Land sea and ice map
-
-  'set gxout grfill'
-  'set clevs -0.5  0.5'
-  'set ccols 63  62  0'
-  'd map'
-  
-* Plot wave heights
-
-  'set gxout shaded'
-  'set clevs  0.05 0.1 0.15 0.2 0.25 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.25 1.5 2. 3'
-  'set ccols 21 22  23  24  25  26  27  28  29  30  31  32  33  34  35  36  37  38'
-  'd hs'
-  'run cbarn'
-
-* Plot mean directions
-
-  'set gxout vector'
-  'set cthick 3'
-  'set arrscl 0.25'
-  'set arrlab off'
-  'set ccolor 0'
-  'd skip(cos(dir),5);skip(sin(dir),5)'
-
-* Text around plot
-
-  'set strsiz 0.18'
-  'set string 1 c 5'
-  'draw string 5.5 7.7 WAVEWATCH III TEST'
-
-  'set strsiz 0.12'
-  'set string 1 l'
-  'draw string  0.5 7.3 Propagation test ww3_tp2.2'
-  'set string 1 r'
-  'draw string 10.5 7.3 valid ' vdate
-  'set string 1 c'
-  'draw string 5.5 1.0 wave height (shaded, m) and mean direction (vector, not scaled)'
-  'draw string 5.5 7.3 plot generated ' gdate
-
-*  Print this page and clear
-
-  'printim map2_2_'t'.png'
-  'clear'
-  'set grads off'
-
-  t = t + 1
-endwhile
-
-'quit'
-
-* end of map2_2.gs

From a1296986420f56f1bcdc3ea603982182b4092c78 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Fri, 27 Oct 2023 20:18:40 +0000
Subject: [PATCH 14/35] ww3_tp2.22: *.inp - adjust sim times

---
 regtests/ww3_tp2.22/input/ww3_ounf.inp | 2 +-
 regtests/ww3_tp2.22/input/ww3_outf.inp | 2 +-
 regtests/ww3_tp2.22/input/ww3_shel.inp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/regtests/ww3_tp2.22/input/ww3_ounf.inp b/regtests/ww3_tp2.22/input/ww3_ounf.inp
index 3a596fc03..37bd76c61 100644
--- a/regtests/ww3_tp2.22/input/ww3_ounf.inp
+++ b/regtests/ww3_tp2.22/input/ww3_ounf.inp
@@ -4,7 +4,7 @@ $--------------------------------------------------------------------- $
 $ First output time (yyyymmdd hhmmss), increment of output (s),
 $ and number of output times.
 $
-  19680606 000000 10800. 100
+  19680606 000000 3600. 12
 $
 $ Fields requested --------------------------------------------------- $
 $
diff --git a/regtests/ww3_tp2.22/input/ww3_outf.inp b/regtests/ww3_tp2.22/input/ww3_outf.inp
index c1d1a0811..a342c20ef 100644
--- a/regtests/ww3_tp2.22/input/ww3_outf.inp
+++ b/regtests/ww3_tp2.22/input/ww3_outf.inp
@@ -1,6 +1,6 @@
 $ WAVEWATCH III Grid output post-processing
 $ -----------------------------------------
-  19680612 000000 518400. 2
+  19680606 000000 3600. 12
 $
   N
   HS T01 DIR SPR USS
diff --git a/regtests/ww3_tp2.22/input/ww3_shel.inp b/regtests/ww3_tp2.22/input/ww3_shel.inp
index 1c25475a9..e1547e036 100644
--- a/regtests/ww3_tp2.22/input/ww3_shel.inp
+++ b/regtests/ww3_tp2.22/input/ww3_shel.inp
@@ -15,7 +15,7 @@ $
 $
    1
 $
-   19680606 000000  10800  19680608 000000
+   19680606 000000  3600  19680608 000000
 $
   N
   HS EF T01 DIR SPR USS

From ac7ab56f123825af62180c681ed06093bb35384b Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Fri, 27 Oct 2023 20:28:16 +0000
Subject: [PATCH 15/35] ww3_tp2.22: info - updates for output variables

---
 regtests/ww3_tp2.22/info | 33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

diff --git a/regtests/ww3_tp2.22/info b/regtests/ww3_tp2.22/info
index 6059cc939..97cd6bfeb 100644
--- a/regtests/ww3_tp2.22/info
+++ b/regtests/ww3_tp2.22/info
@@ -1,8 +1,8 @@
 #############################################################################
 #                                                                           #
-# ww3_tp2.22 Test script for WW-III, two-dimensional propagation and LMP    #
-#           Propagation over half the globe.                                #
-#           Langmuir Mixing Parameterization                                #
+# ww3_tp2.22 Test script for WW-III demonstrating the Langmuir Mixing       #
+#            Parmeterization, for the case of two-dimensional propagation   #
+#            over half the globe.                                           #
 #                                                                           #
 # Model should be compiled with the switches :                              #
 #                                                                           #
@@ -16,33 +16,12 @@
 #   !/O0 !/O1 !/O2 !/O3 !/O4 !/O5 !/O6 !/O7   Sdt out output options.       #
 #                                                                           #
 # Remarks :                                                                 #
-# - Test case input (default):                                              #
-#   * Single grid, but run using ww3_multi.                                 #
-#   * ww3_grid.inp : (default)                                              #
-#     + Spatial grid: 193 x 93 rectilinear lat/lon grid                     #
-#       - dx = 1.0 deg, dy = 1.0 deg                                        #
-#       - Xrange = -6:186 deg, Yrange = -46:46 deg                          #
-#     + Spectral grid: ntheta = 24, nf =  3, f1 = 0.03679, fgamma = 1.1     #
+# - Test case input:
 #     + Langmuir mixing parameterization (LMPENABLED = T) and tail          #
 #       contribution (SDTAIL = T) enabled. A uniform (10m) surface layer    #
 #       depth is asumed (HSLMODE = 0).                                      #
-#   * map2_2.gs: grads script for visualizing results.                      #
-#   * GSE correction is enabled. To disable GSE correction                  #
-#     comment/uncomment the appropriate lines in ww3_grid.inp.              #
-#   * switch options (mostly self-explanatory).                             #
-#     + switch_PR1     : First order scheme                                 #
-#     + switch_PR2_UNO : UQ scheme with diffusion                           #
-#     + switch_PR2_UQ  : UQ scheme with diffusion                           #
-#     + switch_PR3_UNO : UQ scheme with averaging  (default)                #
-#     + switch_PR3_UQ  : UQ scheme with averaging  (default)                #
-#     + switch_PR1_MPI                                                      #
-#     + switch_PR2_UNO_MPI                                                  #
-#     + switch_PR2_UQ_MPI                                                   #
-#     + switch_PR3_UNO_MPI                                                  #
-#     + switch_PR3_UQ_MPI                                                   #
 # - Test case output:
-#   * USSX/USSY:   surface Stokes drift
-#   * USSHX/USSHY: surface layer averaged Stokes drift
+#     + USSX/USSY:   surface Stokes drift
 #
 #                                                                           #
 #  Sample run_test commands :                                               #
@@ -64,6 +43,8 @@
 #    When HSLMODE == 0, a uniform 10m HSL is assumed for testing purposes.  #
 #    When HSLMODE == 1, the HSL field is to be received from the active     #
 #    ocean model via coupler.                                               #
+#
+#    The WW3 output variables ... USSX,USSY.  USSHX,USSHY.
 #                                                                           #
 #    For more info on the Langmuir parameterization, see:                   #
 #       Li, Qing, et al. "Langmuir mixing effects on global climate:        #

From 94801a7cf9bf5fb8c0996e1e226f62d8ae2905c8 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <matthew.masarik@noaa.gov>
Date: Tue, 7 Nov 2023 08:25:16 -0600
Subject: [PATCH 16/35] ww3_shel.inp: add USSH

---
 regtests/ww3_tp2.22/input/ww3_shel.inp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regtests/ww3_tp2.22/input/ww3_shel.inp b/regtests/ww3_tp2.22/input/ww3_shel.inp
index e1547e036..6b946943c 100644
--- a/regtests/ww3_tp2.22/input/ww3_shel.inp
+++ b/regtests/ww3_tp2.22/input/ww3_shel.inp
@@ -18,7 +18,7 @@ $
    19680606 000000  3600  19680608 000000
 $
   N
-  HS EF T01 DIR SPR USS
+  HS EF T01 DIR SPR USS USSH
 $
    19680606 000000  21600  19680608 000000
      0.0   0.0   'LEFT'

From 25750e251d34f06710c9d626e6f8ac9a80e4cc4d Mon Sep 17 00:00:00 2001
From: Matthew Masarik <matthew.masarik@noaa.gov>
Date: Tue, 7 Nov 2023 09:55:40 -0600
Subject: [PATCH 17/35] w3ounfmetamd.F90: update for USSH

---
 model/src/w3ounfmetamd.F90 | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/model/src/w3ounfmetamd.F90 b/model/src/w3ounfmetamd.F90
index fd00c7bb3..7789dc80a 100644
--- a/model/src/w3ounfmetamd.F90
+++ b/model/src/w3ounfmetamd.F90
@@ -3744,6 +3744,10 @@ SUBROUTINE DEFAULT_META()
     META(2)%VARNS=''
     META(2)%VARNG=''
     META(2)%VARNC='toc=sqrt(utoc**2+vtoc**2)'
+
+
+
+
     !
     !---------- GROUP 7 ----------------
     !
@@ -3956,6 +3960,29 @@ SUBROUTINE DEFAULT_META()
     META(1)%VARNC='Goda wave peakedness parameter'
     META(1)%VMIN = 0
     META(1)%VMAX = 32
+
+
+    ! IFI=8, IFJ=14, USSH
+    META => GROUP(8)%FIELD(14)%META
+    META(1)%FSC    = 0.0005
+    META(1)%UNITS  = 'm s-1'
+    META(1)%ENAME  = '.ussh'
+
+    ! First component
+    META(1)%VARNM='uussh'
+    META(1)%VARNL='eastward surface averaged stokes drift'
+    META(1)%VARNS='sea_surface_wave_averaged_stokes_drift_eastward_velocity'
+    META(1)%VARNG='eastward_surface_averaged_stokes_drift'
+    META(1)%VARND=DIRCOM
+    META(1)%VMIN = -4.95
+    META(1)%VMAX =  4.95
+
+    ! Second component
+    META(2) = META(1)
+    META(2)%VARNM='vussh'
+    META(2)%VARNL='northward surface averaged stokes drift'
+    META(2)%VARNS='sea_surface_wave_averaged_stokes_drift_northward_velocity'
+    META(2)%VARNG='northward_surface_averaged_stokes_drift'
     !
     !---------- GROUP 9 ----------------
     !

From 1be8e3356f473fcf05ef7c2071075ea30cfa4418 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <matthew.masarik@noaa.gov>
Date: Tue, 7 Nov 2023 10:29:58 -0600
Subject: [PATCH 18/35] w3ounfmetamd.F90: fix group number, 8 -> 6

---
 model/src/w3ounfmetamd.F90 | 42 ++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/model/src/w3ounfmetamd.F90 b/model/src/w3ounfmetamd.F90
index 7789dc80a..b3fb394f2 100644
--- a/model/src/w3ounfmetamd.F90
+++ b/model/src/w3ounfmetamd.F90
@@ -3745,7 +3745,27 @@ SUBROUTINE DEFAULT_META()
     META(2)%VARNG=''
     META(2)%VARNC='toc=sqrt(utoc**2+vtoc**2)'
 
+    ! IFI=6, IFJ=14, USSH
+    META => GROUP(6)%FIELD(14)%META
+    META(1)%FSC    = 0.0005
+    META(1)%UNITS  = 'm s-1'
+    META(1)%ENAME  = '.ussh'
 
+    ! First component
+    META(1)%VARNM='uussh'
+    META(1)%VARNL='eastward surface averaged stokes drift'
+    META(1)%VARNS='sea_surface_wave_averaged_stokes_drift_eastward_velocity'
+    META(1)%VARNG='eastward_surface_averaged_stokes_drift'
+    META(1)%VARND=DIRCOM
+    META(1)%VMIN = -4.95
+    META(1)%VMAX =  4.95
+
+    ! Second component
+    META(2) = META(1)
+    META(2)%VARNM='vussh'
+    META(2)%VARNL='northward surface averaged stokes drift'
+    META(2)%VARNS='sea_surface_wave_averaged_stokes_drift_northward_velocity'
+    META(2)%VARNG='northward_surface_averaged_stokes_drift'
 
 
     !
@@ -3961,28 +3981,6 @@ SUBROUTINE DEFAULT_META()
     META(1)%VMIN = 0
     META(1)%VMAX = 32
 
-
-    ! IFI=8, IFJ=14, USSH
-    META => GROUP(8)%FIELD(14)%META
-    META(1)%FSC    = 0.0005
-    META(1)%UNITS  = 'm s-1'
-    META(1)%ENAME  = '.ussh'
-
-    ! First component
-    META(1)%VARNM='uussh'
-    META(1)%VARNL='eastward surface averaged stokes drift'
-    META(1)%VARNS='sea_surface_wave_averaged_stokes_drift_eastward_velocity'
-    META(1)%VARNG='eastward_surface_averaged_stokes_drift'
-    META(1)%VARND=DIRCOM
-    META(1)%VMIN = -4.95
-    META(1)%VMAX =  4.95
-
-    ! Second component
-    META(2) = META(1)
-    META(2)%VARNM='vussh'
-    META(2)%VARNL='northward surface averaged stokes drift'
-    META(2)%VARNS='sea_surface_wave_averaged_stokes_drift_northward_velocity'
-    META(2)%VARNG='northward_surface_averaged_stokes_drift'
     !
     !---------- GROUP 9 ----------------
     !

From e789a2169870e752c856d8d64d98b0d7bfb0f636 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <matthew.masarik@noaa.gov>
Date: Tue, 7 Nov 2023 11:52:32 -0600
Subject: [PATCH 19/35] ww3_ounf.F90: add USSHX/Y

---
 model/src/ww3_ounf.F90 | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/model/src/ww3_ounf.F90 b/model/src/ww3_ounf.F90
index 0a2cadfca..3c8ebb4ec 100644
--- a/model/src/ww3_ounf.F90
+++ b/model/src/ww3_ounf.F90
@@ -186,7 +186,7 @@ PROGRAM W3OUNF
        TAUOX, TAUOY, TAUWIX,                        &
        TAUWIY, PHIAW, PHIOC, TUSX, TUSY, PRMS, TPMS,&
        USSX, USSY, MSSX, MSSY, MSSD, MSCX, MSCY,    &
-       MSCD, CHARN, TWS, TAUA, TAUADIR,             &
+       MSCD, CHARN, TWS, TAUA, TAUADIR,USSHX,USSHY, &
        TAUWNX, TAUWNY, BHD, T02, HSIG, CGE,         &
        T01, BEDFORMS, WHITECAP, TAUBBL, PHIBBL,     &
        CFLTHMAX, CFLXYMAX, CFLKMAX, TAUICE, PHICE,  &
@@ -1854,6 +1854,23 @@ SUBROUTINE W3EXNC ( NX, NY, IX1, IXN, IY1, IYN, NSEA,             &
               CALL W3S2XY ( NSEA, NSEA, NX+1, NY, TAUOCY(1:NSEA)     &
                    , MAPSF, XY )
             ENDIF ! SMCGRD
+            !
+            NFIELD=2
+
+            !
+            ! Surface averaged stokes drift
+          ELSE IF ( IFI .EQ. 6 .AND. IFJ .EQ. 14 ) THEN
+            DO ISEA=1, NSEA
+              USSHX(ISEA)=MAX(-0.9998,MIN(0.9998,USSHX(ISEA)))
+              USSHY(ISEA)=MAX(-0.9998,MIN(0.9998,USSHY(ISEA)))
+            END DO
+#ifdef W3_RTD
+            ! Rotate x,y vector back to standard pole
+            IF ( FLAGUNR ) CALL W3XYRTN(NSEA, USSHX(1:NSEA), USSHY(1:NSEA), AnglD)
+#endif
+            CALL S2GRID(USSHX(1:NSEA), XX)
+            CALL S2GRID(USSHY(1:NSEA), XY)
+            !
             NFIELD=2
             !
             ! RMS of bottom displacement amplitude

From c1f4b84fda09e4bd39337be8d193cc97602fd68a Mon Sep 17 00:00:00 2001
From: Matthew Masarik <matthew.masarik@noaa.gov>
Date: Tue, 7 Nov 2023 11:52:57 -0600
Subject: [PATCH 20/35] ww3_outf.F90: add USSHX/Y

---
 model/src/ww3_outf.F90 | 51 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/model/src/ww3_outf.F90 b/model/src/ww3_outf.F90
index e4c1affed..f3a0e6bc2 100644
--- a/model/src/ww3_outf.F90
+++ b/model/src/ww3_outf.F90
@@ -1940,6 +1940,57 @@ SUBROUTINE W3EXGO ( NX, NY, NSEA )
               CALL W3S2XY (NSEA,NSEA,NX+1,NY, TAUOCY(1:NSEA)        &
                    , MAPSF, X2 )
             ENDIF
+
+            !
+          ELSE IF ( IFI .EQ. 6 .AND. IFJ .EQ. 14 ) THEN
+            IF ( VECTOR ) THEN
+              FLTWO  = .TRUE.
+            ELSE
+              FLDIR  = .TRUE.
+            END IF
+            FSC    = 0.001
+            UNITS  = 'm s-1'
+            ENAME  = '.ussh'
+            DO ISEA=1, NSEA
+              IF (USSHX(ISEA) .NE. UNDEF) THEN
+                USSHX(ISEA)=MAX(-0.9998,MIN(0.9998,USSHX(ISEA)))
+                USSHY(ISEA)=MAX(-0.9998,MIN(0.9998,USSHY(ISEA)))
+              END IF
+            END DO
+#ifdef W3_RTD
+            ! Rotate x,y vector back to standard pole
+            IF ( FLAGUNR ) CALL W3XYRTN(NSEA, USSHX, USSHY, AnglD)
+#endif
+            IF ( ITYPE .EQ. 4 ) THEN
+              XS1    = USSHX(1:NSEA)
+              XS2    = USSHY(1:NSEA)
+            ELSE
+              CALL W3S2XY ( NSEA, NSEA, NX+1, NY, USSHX(1:NSEA)     &
+                   , MAPSF, XX )
+              CALL W3S2XY ( NSEA, NSEA, NX+1, NY, USSHY(1:NSEA)     &
+                   , MAPSF, XY )
+            ENDIF
+            DO ISEA=1, NSEA
+              CABS   = SQRT(USSHX(ISEA)**2+USSHY(ISEA)**2)
+              IF ( USSHX(ISEA)  .NE. UNDEF ) THEN
+                USSHY(ISEA) = MOD ( 630. -                      &
+                     RADE*ATAN2(USSHY(ISEA),USSHX(ISEA)) , 360. )
+              ELSE
+                USSHY(ISEA) = UNDEF
+                CABS        = UNDEF
+              END IF
+              USSHX(ISEA) = CABS
+            END DO
+            IF ( ITYPE .EQ. 4 ) THEN
+              XS3    = USSHX(1:NSEA)
+              XS4    = USSHY(1:NSEA)
+            ELSE
+              CALL W3S2XY ( NSEA, NSEA, NX+1, NY, USSHX(1:NSEA),     &
+                   MAPSF, X1 )
+              CALL W3S2XY ( NSEA, NSEA, NX+1, NY, USSHY(1:NSEA),     &
+                   MAPSF, X2 )
+            ENDIF
+
             !
           ELSE IF ( IFI .EQ. 7 .AND. IFJ .EQ. 1 ) THEN
             IF ( VECTOR ) THEN

From f1d5b93d903732e71c7148611cb616c1bd21ac70 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <matthew.masarik@noaa.gov>
Date: Tue, 7 Nov 2023 11:58:17 -0600
Subject: [PATCH 21/35] ww3_shel.inp: add USSHX/Y

---
 model/inp/ww3_shel.inp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/model/inp/ww3_shel.inp b/model/inp/ww3_shel.inp
index 8eca9b58a..a56dcf51b 100644
--- a/model/inp/ww3_shel.inp
+++ b/model/inp/ww3_shel.inp
@@ -198,6 +198,7 @@ $  F  F  6    10   TAUICE     TWI   Wave to sea ice stress
 $  F  F  6    11   PHICE      FIC   Wave to sea ice energy flux
 $  F  F  6    12   USSP       USP   Partitioned surface Stokes drift
 $  F  F  6    13   TAUOC[X,Y] TOC   Total momentum to the ocean
+$  F  F  6    14   USSH[X,Y]  USSH  Surface averaged Stokes drift
 $   -------------------------------------------------
 $        7                          Wave-bottom layer
 $   -------------------------------------------------

From b1ddc7f02c50bbe5d224a76756d626c2fa1a7bc1 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <matthew.masarik@noaa.gov>
Date: Tue, 7 Nov 2023 12:08:17 -0600
Subject: [PATCH 22/35] w3odatmd.F90: update for USSH

---
 model/src/w3odatmd.F90 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/model/src/w3odatmd.F90 b/model/src/w3odatmd.F90
index 203280468..5c1c7d239 100644
--- a/model/src/w3odatmd.F90
+++ b/model/src/w3odatmd.F90
@@ -876,7 +876,7 @@ SUBROUTINE W3NOUT ( NDSERR, NDSTST )
     !
     ! 6) Wave-ocean layer
     !
-    NOGE(6) = 13
+    NOGE(6) = 14
     !
     IDOUT( 6, 1)  = 'Radiation stresses  '
     IDOUT( 6, 2)  = 'Wave-ocean mom. flux'
@@ -891,7 +891,7 @@ SUBROUTINE W3NOUT ( NDSERR, NDSTST )
     IDOUT( 6,11)  = 'Wave-ice energy flux'
     IDOUT( 6,12)  = 'Split Surface Stokes'
     IDOUT( 6,13)  = 'Tot wav-ocn mom flux'
-    IDOUT( 6,14)  = 'Turbulent Langmuir number'
+    IDOUT( 6,14)  = 'Stokes drift sfc ave'
     !
     ! 7) Wave-bottom layer
     !

From d7ced8b353a1f34235ddadf8de8d96650f349b3a Mon Sep 17 00:00:00 2001
From: Matthew Masarik <matthew.masarik@noaa.gov>
Date: Tue, 7 Nov 2023 12:43:20 -0600
Subject: [PATCH 23/35] ww3_ounf.inp: update for USSH

---
 regtests/ww3_tp2.22/input/ww3_ounf.inp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regtests/ww3_tp2.22/input/ww3_ounf.inp b/regtests/ww3_tp2.22/input/ww3_ounf.inp
index 37bd76c61..0b8c65089 100644
--- a/regtests/ww3_tp2.22/input/ww3_ounf.inp
+++ b/regtests/ww3_tp2.22/input/ww3_ounf.inp
@@ -13,7 +13,7 @@ $ file for a full documentation of field output options. Namelist type
 $ selection is used here (for alternative F/T flags, see ww3_shel.inp).
 $
  N
- HS T01 DIR SPR USS
+ HS T01 DIR SPR USS USSH
 $
 $--------------------------------------------------------------------- $
 $ netCDF version [3,4]

From 00ea0167f573115612f488d2467eac5be5031716 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <matthew.masarik@noaa.gov>
Date: Tue, 7 Nov 2023 12:43:49 -0600
Subject: [PATCH 24/35] ww3_outf.inp: update for USSH

---
 regtests/ww3_tp2.22/input/ww3_outf.inp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regtests/ww3_tp2.22/input/ww3_outf.inp b/regtests/ww3_tp2.22/input/ww3_outf.inp
index a342c20ef..2ee125996 100644
--- a/regtests/ww3_tp2.22/input/ww3_outf.inp
+++ b/regtests/ww3_tp2.22/input/ww3_outf.inp
@@ -3,7 +3,7 @@ $ -----------------------------------------
   19680606 000000 3600. 12
 $
   N
-  HS T01 DIR SPR USS
+  HS T01 DIR SPR USS USSH
 $
   1 0
 $

From e3e950b9c190c18db276731a1da6466bcba6174e Mon Sep 17 00:00:00 2001
From: Matthew Masarik <matthew.masarik@noaa.gov>
Date: Tue, 7 Nov 2023 12:44:28 -0600
Subject: [PATCH 25/35] info: add USSH + polishing

---
 regtests/ww3_tp2.22/info | 49 ++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/regtests/ww3_tp2.22/info b/regtests/ww3_tp2.22/info
index 97cd6bfeb..d16906ae1 100644
--- a/regtests/ww3_tp2.22/info
+++ b/regtests/ww3_tp2.22/info
@@ -1,36 +1,23 @@
 #############################################################################
 #                                                                           #
-# ww3_tp2.22 Test script for WW-III demonstrating the Langmuir Mixing       #
-#            Parmeterization, for the case of two-dimensional propagation   #
-#            over half the globe.                                           #
+# ww3_tp2.22 Test script for WW-III, demonstrating Langmuir Mixing          #
+#            Parmeterization for the case of two-dimensional propagation    #
+#            over half the globe. Based on ww3_tp2.2 using switch           #
+#            PR3_UQ_MPI.                                                    #
 #                                                                           #
-# Model should be compiled with the switches :                              #
+# Remarks :                                                                 #
+# - Test case input:                                                        #
+#     + Langmuir mixing parameterization (LMPENABLED = T), with             #
+#     + tail contribution (SDTAIL = T) enabled.                             #
+#     + A uniform (10m) surface layer depth is assumed (HSLMODE = 0).       #
 #                                                                           #
-#   !/LN0 !/ST0 !/NL0 !/BT0 !/DB0 !/TR0 !/BS0                               #
-#                        Select the 'no source terms' option.               #
-#   !/PRn                Selecting one of the propagation schemes.          #
-#                         1: First order.                                   #
-#                         2: UQ with diffusion term.                        #
-#                         3: UQ with averaging (set to zero here).          #
-#   !/WNX1 !/WNT1 !/CRX1 !/CRT1      Wind and current interpolation.        #
-#   !/O0 !/O1 !/O2 !/O3 !/O4 !/O5 !/O6 !/O7   Sdt out output options.       #
+# - Test case output:                                                       #
+#     + USSX/USSY:   surface Stokes drift           (.nc: uuss/vuss)        #
+#     + USSHX/USSHY: surface averaged Stokes drift  (.nc: uussh/vussh)      #
 #                                                                           #
-# Remarks :                                                                 #
-# - Test case input:
-#     + Langmuir mixing parameterization (LMPENABLED = T) and tail          #
-#       contribution (SDTAIL = T) enabled. A uniform (10m) surface layer    #
-#       depth is asumed (HSLMODE = 0).                                      #
-# - Test case output:
-#     + USSX/USSY:   surface Stokes drift
-#
-#                                                                           #
-#  Sample run_test commands :                                               #
+# 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          #
-#                                                                           #
-#                                              Hendrik Tolman, Jun 2002     #
-#                                                   Last Mod : Dec 2013     #
+# ./bin/run_cmake_test -n 4 -p mpirun -f -s PR3_UQ_MPI ../model ww3_tp2.22  #
 #                                                                           #
 # Notes on LMPN namelist and Langmuir Mixing Parameterization:              #
 #                                                                           #
@@ -43,15 +30,17 @@
 #    When HSLMODE == 0, a uniform 10m HSL is assumed for testing purposes.  #
 #    When HSLMODE == 1, the HSL field is to be received from the active     #
 #    ocean model via coupler.                                               #
-#
-#    The WW3 output variables ... USSX,USSY.  USSHX,USSHY.
+#                                                                           #
+#    The WW3 output variables ... USSX,USSY.  USSHX,USSHY.                  #
 #                                                                           #
 #    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.        #
 #                                                                           #
+#                                              Hendrik Tolman, Jun 2002     #
+#                                   Last Mod : Li / Altuntas,  Nov 2023     #
 #                                                                           #
-#    Copyright 2009-2013 National Weather Service (NWS),                    #
+#    Copyright 2009-2023 National Weather Service (NWS),                    #
 #       National Oceanic and Atmospheric Administration.  All rights        #
 #       reserved.  WAVEWATCH III is a trademark of the NWS.                 #
 #       No unauthorized use without permission.                             #

From ecbce556f38f63d0a0b266531be63b6cde2e1d48 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <matthew.masarik@noaa.gov>
Date: Tue, 7 Nov 2023 13:39:51 -0600
Subject: [PATCH 26/35] ww3_outf.F90: USE W3ADATMD.F90 ONLY USSHX,USSHY

---
 model/src/ww3_outf.F90 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/model/src/ww3_outf.F90 b/model/src/ww3_outf.F90
index f3a0e6bc2..12f0a0f06 100644
--- a/model/src/ww3_outf.F90
+++ b/model/src/ww3_outf.F90
@@ -167,7 +167,7 @@ PROGRAM W3OUTF
        CFLTHMAX, CFLKMAX, BEDFORMS, WHITECAP, T02, &
        CGE, T01, HSIG, STMAXE, STMAXD, HMAXE,      &
        HCMAXE, HMAXD, HCMAXD, MSSD, MSCD, WBT,     &
-       WNMEAN, TAUA, TAUADIR
+       WNMEAN, TAUA, TAUADIR, USSHX, USSHY
   USE W3ODATMD, ONLY: NDSO, NDSE, NDST, NOGRP, NGRPP, IDOUT,      &
        UNDEF, FLOGRD, FNMPRE, NOSWLL, NOGE
   !

From c9cfedd61844add18915955a2581afd205e4b4ec Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Wed, 8 Nov 2023 19:42:01 +0000
Subject: [PATCH 27/35] ww3_tp2.22/ww3_grid*.inp: update for "sdtail" and "no
 tail"

---
 regtests/ww3_tp2.22/input/ww3_grid.inp        |  2 +-
 regtests/ww3_tp2.22/input/ww3_grid_sdtail.inp | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 regtests/ww3_tp2.22/input/ww3_grid_sdtail.inp

diff --git a/regtests/ww3_tp2.22/input/ww3_grid.inp b/regtests/ww3_tp2.22/input/ww3_grid.inp
index e021a094a..83213e0e1 100644
--- a/regtests/ww3_tp2.22/input/ww3_grid.inp
+++ b/regtests/ww3_tp2.22/input/ww3_grid.inp
@@ -10,7 +10,7 @@ $
   &PRO2 DTIME = 345600. /
   &PRO3 WDTHCG = 1.50, WDTHTH =1.50 /
   &OUTS E3D = 1 /
-  &LMPN LMPENABLED = T, SDTAIL = T, HSLMODE = 0 /
+  &LMPN LMPENABLED = T, SDTAIL = F, HSLMODE = 0 /
 END OF NAMELISTS
 $
   'RECT' T 'NONE'
diff --git a/regtests/ww3_tp2.22/input/ww3_grid_sdtail.inp b/regtests/ww3_tp2.22/input/ww3_grid_sdtail.inp
new file mode 100644
index 000000000..e021a094a
--- /dev/null
+++ b/regtests/ww3_tp2.22/input/ww3_grid_sdtail.inp
@@ -0,0 +1,33 @@
+$ WAVEWATCH III Grid preprocessor input file
+$ ------------------------------------------
+  'LANGMUIR MIXING PARAMETERIZATION FOR 2-D PROP. AROUND GLOBE'
+$
+   1.1 0.040 9  24  0.
+$
+   F T T T F F
+  2200.  2200. 2200.  2200.
+$
+  &PRO2 DTIME = 345600. /
+  &PRO3 WDTHCG = 1.50, WDTHTH =1.50 /
+  &OUTS E3D = 1 /
+  &LMPN LMPENABLED = T, SDTAIL = T, HSLMODE = 0 /
+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

From b865de14194cfd81953d86b10259e6188a16f764 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Wed, 8 Nov 2023 20:00:34 +0000
Subject: [PATCH 28/35] matrix.base: add ww3_tp2.22 - "sdtail" and "no tail"

---
 regtests/bin/matrix.base | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/regtests/bin/matrix.base b/regtests/bin/matrix.base
index afbb995f8..30df4b874 100755
--- a/regtests/bin/matrix.base
+++ b/regtests/bin/matrix.base
@@ -816,7 +816,9 @@
 
       if [ "$lmp" == "y" ];      # Langmuir mixing parameterization
       then
+        echo ' ' >> matrix.body
         echo "$rtst -s PR3_UQ_MPI              -w work_PR3_UQ_MPI                  -f -p $mpi -n $np $ww3 ww3_tp2.22" >> matrix.body
+        echo "$rtst -s PR3_UQ_MPI -g sdtail    -w work_PR3_UQ_MPI_SDTAIL           -f -p $mpi -n $np $ww3 ww3_tp2.22" >> matrix.body
       fi
     fi
 

From 7b013dac5817e144faffcb233077088eac5038ba Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Thu, 16 Nov 2023 19:16:07 +0000
Subject: [PATCH 29/35] rename: switch_PR3_UQ_MPI --> switch

---
 regtests/ww3_tp2.22/input/{switch_PR3_UQ_MPI => switch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename regtests/ww3_tp2.22/input/{switch_PR3_UQ_MPI => switch} (100%)

diff --git a/regtests/ww3_tp2.22/input/switch_PR3_UQ_MPI b/regtests/ww3_tp2.22/input/switch
similarity index 100%
rename from regtests/ww3_tp2.22/input/switch_PR3_UQ_MPI
rename to regtests/ww3_tp2.22/input/switch

From 3a5ea6748a9132cdb3e5256100f2c68477c7fe53 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Thu, 16 Nov 2023 20:04:23 +0000
Subject: [PATCH 30/35] model/inp/ww3_grid.inp: document output parameters

---
 model/inp/ww3_grid.inp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/model/inp/ww3_grid.inp b/model/inp/ww3_grid.inp
index 735c87cd7..27675a5ef 100644
--- a/model/inp/ww3_grid.inp
+++ b/model/inp/ww3_grid.inp
@@ -431,7 +431,7 @@ $   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
+$   Input parameters  : Namelist LMPN
 $                       LMPENABLED : Logical controlling Langmuir
 $                                    related computations.
 $                                     T : Activates calculations
@@ -446,6 +446,12 @@ $                                    depth (HSL) type.
 $                                     0 : Uniform HSL=10m (default)
 $                                     1 : HSL from coupler
 $
+$   Output parameters :
+$                       USS        : surface Stokes drift
+$                                     USSX/Y  (netCDF: uuss/vuss)
+$                       USSH       : surface layer averaged Stokes drift
+$                                     USSHX/Y (netCDF: uussh/vussh)
+$
 $   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.

From 84ec561bbfd5af3cc038cc172e5a6e26d6bfa35a Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Thu, 16 Nov 2023 20:06:07 +0000
Subject: [PATCH 31/35] info: updates for Test Cases, output parameters,
 general desc

---
 regtests/ww3_tp2.22/info | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/regtests/ww3_tp2.22/info b/regtests/ww3_tp2.22/info
index d16906ae1..c5e483a3c 100644
--- a/regtests/ww3_tp2.22/info
+++ b/regtests/ww3_tp2.22/info
@@ -1,23 +1,35 @@
 #############################################################################
 #                                                                           #
-# ww3_tp2.22 Test script for WW-III, demonstrating Langmuir Mixing          #
+# ww3_tp2.22 Test script for WW-III demonstrating Langmuir Mixing           #
 #            Parmeterization for the case of two-dimensional propagation    #
-#            over half the globe. Based on ww3_tp2.2 using switch           #
-#            PR3_UQ_MPI.                                                    #
+#            over half the globe. Based on regtest ww3_tp2.2 with           #
+#            switch_PR3_UQ_MPI used as a sample switch.                     #
 #                                                                           #
-# Remarks :                                                                 #
-# - Test case input:                                                        #
-#     + Langmuir mixing parameterization (LMPENABLED = T), with             #
-#     + tail contribution (SDTAIL = T) enabled.                             #
-#     + A uniform (10m) surface layer depth is assumed (HSLMODE = 0).       #
+#            Two test cases are run. Both have LMPENABLED, with one which   #
+#            includes the tail contribution, the other does not.            #
 #                                                                           #
-# - Test case output:                                                       #
-#     + USSX/USSY:   surface Stokes drift           (.nc: uuss/vuss)        #
-#     + USSHX/USSHY: surface averaged Stokes drift  (.nc: uussh/vussh)      #
+# Remarks :                                                                 #
+# - Test case input parameters:                                             #
+#   I. NO TAIL                                                              #
+#   ----------                                                              #
+#     + LMPENABLED = T:  Langmuir mixing parameterization enabled.          #
+#     + SDTAIL     = F:  tail contribution NOT enabled.                     #
+#     + HSLMODE    = 0:  uniform (10m) surface layer depth is assumed.      #
+#                                                                           #
+#   II. TAIL INCLUDED                                                       #
+#   -----------------                                                       #
+#     + LMPENABLED = T:  Langmuir mixing parameterization enabled.          #
+#     + SDTAIL     = T:  tail contribution enabled.                         #
+#     + HSLMODE    = 0:  uniform (10m) surface layer depth is assumed.      #
+#                                                                           #
+# - Test case output parameters:                                            #
+#     + USSX/USSY:   surface Stokes drift           (netCDF:   uuss/vuss)   #
+#     + USSHX/USSHY: surface averaged Stokes drift  (netCDF: uussh/vussh)   #
 #                                                                           #
 # Sample run_test commands :                                                #
 #   (Note: mpirun commands differ by local system)                          #
-# ./bin/run_cmake_test -n 4 -p mpirun -f -s PR3_UQ_MPI ../model ww3_tp2.22  #
+# ./bin/run_cmake_test -n 4 -p mpirun -f           ../model ww3_tp2.22      #
+# ./bin/run_cmake_test -n 4 -p mpirun -f -g sdtail ../model ww3_tp2.22      #
 #                                                                           #
 # Notes on LMPN namelist and Langmuir Mixing Parameterization:              #
 #                                                                           #
@@ -25,14 +37,12 @@
 #    Parameterization used within the context of climate modeling and       #
 #    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.                #
+#    The SDTAIL flag enables the spectral tail contribution.                #
 #    HSLMODE parameter determines the surface layer depth (HSL).            #
 #    When HSLMODE == 0, a uniform 10m HSL is assumed for testing purposes.  #
 #    When HSLMODE == 1, the HSL field is to be received from the active     #
 #    ocean model via coupler.                                               #
 #                                                                           #
-#    The WW3 output variables ... USSX,USSY.  USSHX,USSHY.                  #
-#                                                                           #
 #    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.        #

From 8250be07362fb12f5b60579604fd1252b91d93a1 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Thu, 16 Nov 2023 20:25:17 +0000
Subject: [PATCH 32/35] model/inp/ww3_shel.inp: add TOC to group 6,13 to prep
 for USSH group 6,14

---
 model/inp/ww3_shel.inp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/model/inp/ww3_shel.inp b/model/inp/ww3_shel.inp
index a56dcf51b..52ac5ebc0 100644
--- a/model/inp/ww3_shel.inp
+++ b/model/inp/ww3_shel.inp
@@ -190,7 +190,7 @@ $  F  F  6     2   TAUO[X,Y]  TWO   Wave to ocean momentum flux
 $  F  F  6     3   BHD        BHD   Bernoulli head (J term)
 $  F  F  6     4   PHIOC      FOC   Wave to ocean energy flux
 $  F  F  6     5   TUS[X,Y]   TUS   Stokes transport
-$  F  F  6     6   USS[X,Y]   USS   Surface Stokes drift
+$  F  F  6     6   USS[X,Y]   USS   Surface layer Stokes drift
 $  F  F  6     7   [PR,TP]MS  P2S   Second-order sum pressure
 $  F  F  6     8   US3D       USF   Spectrum of surface Stokes drift
 $  F  F  6     9   P2SMS      P2L   Micro seism  source term
@@ -198,7 +198,7 @@ $  F  F  6    10   TAUICE     TWI   Wave to sea ice stress
 $  F  F  6    11   PHICE      FIC   Wave to sea ice energy flux
 $  F  F  6    12   USSP       USP   Partitioned surface Stokes drift
 $  F  F  6    13   TAUOC[X,Y] TOC   Total momentum to the ocean
-$  F  F  6    14   USSH[X,Y]  USSH  Surface averaged Stokes drift
+$  F  F  6    14   USSH[X,Y]  USSH  Surface layer averaged Stokes drift
 $   -------------------------------------------------
 $        7                          Wave-bottom layer
 $   -------------------------------------------------
@@ -258,8 +258,8 @@ $ UST CHA CGE FAW TAW TWA WCC WCF WCH WCM FWS
   T   T   T   T   T   T   T   T   T   T   T
 $ (6) Wave-Ocean layer
   T
-$ SXY TWO BHD FOC TUS USS P2S USF P2L TWI FIC USP
-  T   T   T   T   T   T   T   F   F   F   F   T
+$ SXY TWO BHD FOC TUS USS P2S USF P2L TWI FIC USP TOC
+  T   T   T   T   T   T   T   F   F   F   F   T   T
 $ (7) Wave-bottom layer
   T
 $ ABR UBR BED FBB TBB

From 258a7721f0b5b518caead9f352eb28eeb6d0aab3 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Thu, 16 Nov 2023 20:26:18 +0000
Subject: [PATCH 33/35] model/inp/ww3_shel.inp: add USSH group 6,14

---
 model/inp/ww3_shel.inp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/model/inp/ww3_shel.inp b/model/inp/ww3_shel.inp
index 52ac5ebc0..1fc2220c1 100644
--- a/model/inp/ww3_shel.inp
+++ b/model/inp/ww3_shel.inp
@@ -258,8 +258,8 @@ $ UST CHA CGE FAW TAW TWA WCC WCF WCH WCM FWS
   T   T   T   T   T   T   T   T   T   T   T
 $ (6) Wave-Ocean layer
   T
-$ SXY TWO BHD FOC TUS USS P2S USF P2L TWI FIC USP TOC
-  T   T   T   T   T   T   T   F   F   F   F   T   T
+$ SXY TWO BHD FOC TUS USS P2S USF P2L TWI FIC USP TOC USSH
+  T   T   T   T   T   T   T   F   F   F   F   T   T   T
 $ (7) Wave-bottom layer
   T
 $ ABR UBR BED FBB TBB

From 921f7a05350003e813ec457b600dc666382e78ea Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Thu, 16 Nov 2023 20:27:46 +0000
Subject: [PATCH 34/35] model/inp/ww3_ounf.inp: add USSH to listings

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

diff --git a/model/inp/ww3_ounf.inp b/model/inp/ww3_ounf.inp
index 7bde30754..8505a4233 100644
--- a/model/inp/ww3_ounf.inp
+++ b/model/inp/ww3_ounf.inp
@@ -15,7 +15,7 @@ $
 $ DPT CUR WND AST WLV ICE IBG TAU RHO D50 IC1 IC5 HS LM T02 T0M1 T01 FP
 $ DIR SPR DP HIG EF TH1M STH1M TH2M STH2M WN PHS PTP PLP PDIR PSPR PWS PDP
 $ PQP PPE PGW PSW PTM10 PT01 PT02 PEP TWS PNR UST CHA CGE FAW TAW TWA WCC
-$ WCF WCH WCM SXY TWO BHD FOC TUS USS P2S USF P2L TWI FIC ABR UBR BED
+$ WCF WCH WCM SXY TWO BHD FOC TUS USS USSH P2S USF P2L TWI FIC ABR UBR BED
 $ FBB TBB MSS MSC DTD FC CFX CFD CFK U1 U2 WNM TOC
 $
  N

From 4c0ee1c3bea3fda41411f16cda5f99d62ac5a0c9 Mon Sep 17 00:00:00 2001
From: Matthew Masarik <Matthew.Masarik@noaa.gov>
Date: Thu, 16 Nov 2023 20:36:07 +0000
Subject: [PATCH 35/35] matrix.base: update to remove PR3_UQ_MPI switch
 identifier

---
 regtests/bin/matrix.base | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/regtests/bin/matrix.base b/regtests/bin/matrix.base
index 30df4b874..28d78634a 100755
--- a/regtests/bin/matrix.base
+++ b/regtests/bin/matrix.base
@@ -817,8 +817,8 @@
       if [ "$lmp" == "y" ];      # Langmuir mixing parameterization
       then
         echo ' ' >> matrix.body
-        echo "$rtst -s PR3_UQ_MPI              -w work_PR3_UQ_MPI                  -f -p $mpi -n $np $ww3 ww3_tp2.22" >> matrix.body
-        echo "$rtst -s PR3_UQ_MPI -g sdtail    -w work_PR3_UQ_MPI_SDTAIL           -f -p $mpi -n $np $ww3 ww3_tp2.22" >> matrix.body
+        echo "$rtst                          -w work_LMPN                        -f -p $mpi -n $np $ww3 ww3_tp2.22" >> matrix.body
+        echo "$rtst             -g sdtail    -w work_LMPN_SDTAIL                 -f -p $mpi -n $np $ww3 ww3_tp2.22" >> matrix.body
       fi
     fi