From 759e1b586232a8acd5af76c69a401cb332dd3bc2 Mon Sep 17 00:00:00 2001
From: "ukmo-chris.bunney" <christopher.bunney@metoffice.gov.uk>
Date: Wed, 4 Oct 2023 15:05:49 +0100
Subject: [PATCH 1/3] Fixed bug where mod_def.<GRD> file was not being linked
 in when running ww3_trck and ww3_trnc in multigrid mode.

---
 regtests/bin/run_cmake_test | 5 ++++-
 regtests/bin/run_test       | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/regtests/bin/run_cmake_test b/regtests/bin/run_cmake_test
index a349240d8..b54c06438 100755
--- a/regtests/bin/run_cmake_test
+++ b/regtests/bin/run_cmake_test
@@ -2023,7 +2023,6 @@ do
 done # end of loop on progs
 
 # 3.i Track output ---------------------------------------------------------- #
-
 case $outopt in
   native) out_progs="ww3_trck" ;;
   netcdf) out_progs="ww3_trnc" ;;
@@ -2070,6 +2069,9 @@ do
           then
             continue
           fi
+
+          \ln -s mod_def.$g mod_def.ww3
+
           gu="_$g"
           fileconf="$prog${gu}"
         else
@@ -2124,6 +2126,7 @@ do
           \rm -f $prog.nml
           if [ $multi -eq 2 ]
           then
+            \rm -f mod_def.ww3
             \rm -f track_o.ww3
             if [ $nml_input ] && [ ! -z "`basename ${ifile} | grep -o nml`" ]
             then
diff --git a/regtests/bin/run_test b/regtests/bin/run_test
index 7ed5ce40e..6765ef046 100755
--- a/regtests/bin/run_test
+++ b/regtests/bin/run_test
@@ -2448,6 +2448,9 @@ do
           then
             continue
           fi
+
+          \ln -s mod_def.$g mod_def.ww3
+
           gu="_$g"
           fileconf="$prog${gu}"
         else
@@ -2502,6 +2505,7 @@ do
           \rm -f $prog.nml
           if [ $multi -eq 2 ]
           then
+            \rm -f mod_def.ww3
             \rm -f track_o.ww3
             if [ $nml_input ] && [ ! -z "`echo ${ifile} | grep -o nml`" ]
             then

From 0f705c7870fe10a38034f65f8be5b758552da464 Mon Sep 17 00:00:00 2001
From: "ukmo-chris.bunney" <christopher.bunney@metoffice.gov.uk>
Date: Thu, 5 Oct 2023 09:28:32 +0100
Subject: [PATCH 2/3] Added `all` option to track output.

---
 regtests/bin/run_cmake_test | 2 +-
 regtests/bin/run_test       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/regtests/bin/run_cmake_test b/regtests/bin/run_cmake_test
index b54c06438..dbbfc0871 100755
--- a/regtests/bin/run_cmake_test
+++ b/regtests/bin/run_cmake_test
@@ -2026,7 +2026,7 @@ done # end of loop on progs
 case $outopt in
   native) out_progs="ww3_trck" ;;
   netcdf) out_progs="ww3_trnc" ;;
-  both)   out_progs="ww3_trck ww3_trnc" ;;
+  both|all) out_progs="ww3_trck ww3_trnc" ;;
   *)      out_progs="" ;;
 esac
 
diff --git a/regtests/bin/run_test b/regtests/bin/run_test
index 6765ef046..560ab0725 100755
--- a/regtests/bin/run_test
+++ b/regtests/bin/run_test
@@ -2368,7 +2368,7 @@ done # end of loop on progs
 case $outopt in
   native) out_progs="ww3_trck" ;;
   netcdf) out_progs="ww3_trnc" ;;
-  both)   out_progs="ww3_trck ww3_trnc" ;;
+  both|all) out_progs="ww3_trck ww3_trnc" ;;
   *)      out_progs="" ;;
 esac
 

From c01a21982fc52007080137d6cf30a4b5fcf43896 Mon Sep 17 00:00:00 2001
From: "ukmo-chris.bunney" <christopher.bunney@metoffice.gov.uk>
Date: Thu, 5 Oct 2023 14:19:21 +0100
Subject: [PATCH 3/3] Removed unneccesary whitespace change

---
 regtests/bin/run_cmake_test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/regtests/bin/run_cmake_test b/regtests/bin/run_cmake_test
index dbbfc0871..206b3681d 100755
--- a/regtests/bin/run_cmake_test
+++ b/regtests/bin/run_cmake_test
@@ -2023,6 +2023,7 @@ do
 done # end of loop on progs
 
 # 3.i Track output ---------------------------------------------------------- #
+
 case $outopt in
   native) out_progs="ww3_trck" ;;
   netcdf) out_progs="ww3_trnc" ;;