Merge branch 'develop' into feature/ascii

umr-lops · Oct 10, 2023 · 4ff0441 · 4ff0441
2 parents ea7b9c1 + b1356dd
commit 4ff0441
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/regtests/bin/run_cmake_test b/regtests/bin/run_cmake_test
@@ -2031,7 +2031,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
 
@@ -2074,6 +2074,9 @@ do
           then
             continue
           fi
+
+          \ln -s mod_def.$g mod_def.ww3
+
           gu="_$g"
           fileconf="$prog${gu}"
         else
@@ -2128,6 +2131,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
@@ -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
 
@@ -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