Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix missing mod_def file for ww3_trck/trnc in multi-grid regression tests #1091

Merged
merged 3 commits into from
Oct 10, 2023
Merged

Fix missing mod_def file for ww3_trck/trnc in multi-grid regression tests #1091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
759e1b5
Fixed bug where mod_def.<GRD> file was not being linked in when running
ukmo-ccbunney Oct 4, 2023
0f705c7
Added `all` option to track output.
ukmo-ccbunney Oct 5, 2023
c01a219
Removed unneccesary whitespace change
ukmo-ccbunney Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion regtests/bin/run_cmake_test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2027,7 +2027,7 @@ done # end of loop on progs
case $outopt in
native) out_progs="ww3_trck" ;;
netcdf) out_progs="ww3_trnc" ;;
ukmo-ccbunney marked this conversation as resolved.
Show resolved Hide resolved
both) out_progs="ww3_trck ww3_trnc" ;;
both|all) out_progs="ww3_trck ww3_trnc" ;;
*) out_progs="" ;;
esac

Expand Down Expand Up @@ -2070,6 +2070,9 @@ do
then
continue
fi

\ln -s mod_def.$g mod_def.ww3

gu="_$g"
fileconf="$prog${gu}"
else
Expand Down Expand Up @@ -2124,6 +2127,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
Expand Down
6 changes: 5 additions & 1 deletion regtests/bin/run_test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -2448,6 +2448,9 @@ do
then
continue
fi

\ln -s mod_def.$g mod_def.ww3

gu="_$g"
fileconf="$prog${gu}"
else
Expand Down Expand Up @@ -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
Expand Down