From f40315c240377bb902031d93f477c7efe8d981b9 Mon Sep 17 00:00:00 2001 From: Mickael Accensi <49198861+mickaelaccensi@users.noreply.github.com> Date: Wed, 9 Feb 2022 23:03:25 +0100 Subject: [PATCH] uniformize regtests output by setting a global output type in the matrix script (#605) --- regtests/bin/matrix.base | 140 +++++++++--------- regtests/bin/matrix_datarmor | 95 ++++++------ regtests/bin/matrix_milhydro | 4 +- regtests/bin/matrix_ncep | 4 +- regtests/bin/matrix_s4 | 4 +- regtests/bin/matrix_ukmo_cray | 4 +- regtests/bin/run_test | 3 +- regtests/ww3_tic2.2/input/ww3_outp_spec.inp | 11 -- regtests/ww3_tic2.2/input/ww3_outp_tab50.inp | 24 --- regtests/ww3_tic2.2/input/ww3_outp_tab51.inp | 2 - .../ww3_tic2.2/input_IC2/ww3_outp_spec.inp | 11 -- .../ww3_tic2.2/input_IC2/ww3_outp_tab50.inp | 24 --- .../ww3_tic2.2/input_IC2/ww3_outp_tab51.inp | 2 - 13 files changed, 128 insertions(+), 200 deletions(-) diff --git a/regtests/bin/matrix.base b/regtests/bin/matrix.base index e89b4fe71..98566c4ad 100755 --- a/regtests/bin/matrix.base +++ b/regtests/bin/matrix.base @@ -680,8 +680,8 @@ echo "$rtst -w work_PR3_UQ $ww3 ww3_tp1.8" >> matrix.body echo "$rtst -i input_BJ -w work_BJ_PR3_UQ $ww3 ww3_tp1.8" >> matrix.body echo "$rtst -w work_PR3_UQ $ww3 ww3_tp1.9" >> matrix.body - echo "$rtst -o netcdf -N -w work_PR3_UQ $ww3 ww3_tp1.11" >> matrix.body - echo "$rtst -i input2 -o netcdf -N -w work_PR3_UQ $ww3 ww3_tp1.11" >> matrix.body + echo "$rtst -N -w work_PR3_UQ $ww3 ww3_tp1.11" >> matrix.body + echo "$rtst -i input2 -N -w work_PR3_UQ $ww3 ww3_tp1.11" >> matrix.body fi if [ "$unstr" = 'y' ] @@ -713,14 +713,14 @@ echo "$rtst -s PR3_UQ -w work_PR3_UQ $ww3 ww3_tp2.5" >> matrix.body echo "$rtst -s PR3_UQ -w work_PR3_UQ_a -g a $ww3 ww3_tp2.9" >> matrix.body echo "$rtst -s PR3_UQ -w work_PR3_UQ_b -g b $ww3 ww3_tp2.9" >> matrix.body - echo "$rtst -o netcdf -w work_PR3_UQ $ww3 ww3_tp2.8" >> matrix.body + echo "$rtst -w work_PR3_UQ $ww3 ww3_tp2.8" >> matrix.body echo "$rtst -s PR3_UQ -w work_PR3_UQ $ww3 ww3_tp2.13" >> matrix.body - echo "$rtst -o netcdf -w work_PR3_UQ $ww3 ww3_tp2.15" >> matrix.body - echo "$rtst -o netcdf -w work_5km -g 5km $ww3 ww3_tp2.15" >> matrix.body - echo "$rtst -o netcdf -i input_rho -w work_PR3_UQ_RHO $ww3 ww3_tp2.15" >> matrix.body - echo "$rtst -s ST4 -i input_rho -w work_ST4FLX5 -o netcdf $ww3 ww3_tp2.15" >> matrix.body - echo "$rtst -s ST6 -i input_rho -w work_ST6FLX5 -o netcdf $ww3 ww3_tp2.15" >> matrix.body - echo "$rtst -o netcdf -s TIDE -w work_TIDE $ww3 ww3_tp2.18" >> matrix.body + echo "$rtst -w work_PR3_UQ $ww3 ww3_tp2.15" >> matrix.body + echo "$rtst -w work_5km -g 5km $ww3 ww3_tp2.15" >> matrix.body + echo "$rtst -i input_rho -w work_PR3_UQ_RHO $ww3 ww3_tp2.15" >> matrix.body + echo "$rtst -s ST4 -i input_rho -w work_ST4FLX5 $ww3 ww3_tp2.15" >> matrix.body + echo "$rtst -s ST6 -i input_rho -w work_ST6FLX5 $ww3 ww3_tp2.15" >> matrix.body + echo "$rtst -s TIDE -w work_TIDE $ww3 ww3_tp2.18" >> matrix.body fi if [ "$multi01" = 'y' ] @@ -811,7 +811,7 @@ echo "$rtst -s MPI -w work_PR3_UQ_MPI -f -p $mpi -n $np $ww3 ww3_tp2.15" >> matrix.body 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 -o netcdf -f -p $mpi -n $np $ww3 ww3_tp2.18" >> matrix.body + echo "$rtst -s TIDE_MPI -w work_TIDE_MPI -f -p $mpi -n $np $ww3 ww3_tp2.18" >> matrix.body fi if [ "$multi01" = 'y' ] @@ -909,8 +909,8 @@ echo "$rtst -s ST4_WRT -w work_ST4_WRT $ww3 ww3_ts1" >> matrix.body echo "$rtst -s ST4_GMD -w work_ST4_GMD $ww3 ww3_ts1" >> matrix.body echo "$rtst -s ST4_TSA -w work_ST4_TSA $ww3 ww3_ts1" >> matrix.body - echo "$rtst -s ST6 -w work_ST6 -o netcdf $ww3 ww3_ts1" >> matrix.body - echo "$rtst -i input_nl5_matrix -w work_NL5 -o both $ww3 ww3_ts1" >> matrix.body + echo "$rtst -s ST6 -w work_ST6 $ww3 ww3_ts1" >> matrix.body + echo "$rtst -i input_nl5_matrix -w work_NL5 $ww3 ww3_ts1" >> matrix.body fi # fetch limited growth, no switch sharing here @@ -1857,7 +1857,7 @@ if [ "$infgrv" = 'y' ] && [ "$shrd" = 'y' ] then echo ' ' >> matrix.body - echo "$rtst $ww3 -w work_IG1 -o netcdf ww3_tig1.1" >> matrix.body + echo "$rtst $ww3 -w work_IG1 ww3_tig1.1" >> matrix.body fi # SMC grid cases, MPI only if requested @@ -1865,20 +1865,20 @@ if [ "$smcgr" = 'y' ] && [ "$shrd" = 'y' ] && [ "$dist" != 'y' ] then echo ' ' >> matrix.body - echo "$rtst $ww3 -w work_SHRD_SMC -o both ww3_tp2.10" >> matrix.body - echo "$rtst -w work_SHRD $ww3 -o both ww3_tp2.16" >> matrix.body + echo "$rtst $ww3 -w work_SHRD_SMC ww3_tp2.10" >> matrix.body + echo "$rtst -w work_SHRD $ww3 ww3_tp2.16" >> matrix.body fi if [ "$smcgr" = 'y' ] && [ "$dist" = 'y' ] then echo ' ' >> matrix.body - echo "$rtst -s MPI -w work_MPI -f -p $mpi -n $np $ww3 -o both ww3_tp2.10" >> matrix.body - echo "$rtst -s MPI -w work_MPI -f -p $mpi -n $np $ww3 -o both ww3_tp2.16" >> matrix.body + echo "$rtst -s MPI -w work_MPI -f -p $mpi -n $np $ww3 ww3_tp2.10" >> matrix.body + echo "$rtst -s MPI -w work_MPI -f -p $mpi -n $np $ww3 ww3_tp2.16" >> matrix.body fi if [ "$smcgr" = 'y' ] && [ "$hybd" = 'y' ]; then - echo "$rtst -s MPI_OMPH -w work_MPI_OMPH -f -p $mpi -n $nr -t $nth $ww3 -o both ww3_tp2.10" >> matrix.body - echo "$rtst -s MPI_OMPH -w work_MPI_OMPH -f -p $mpi -n $nr -t $nth $ww3 -o both ww3_tp2.16" >> matrix.body + echo "$rtst -s MPI_OMPH -w work_MPI_OMPH -f -p $mpi -n $nr -t $nth $ww3 ww3_tp2.10" >> matrix.body + echo "$rtst -s MPI_OMPH -w work_MPI_OMPH -f -p $mpi -n $nr -t $nth $ww3 ww3_tp2.16" >> matrix.body fi if [ "$multi09" = 'y' ] @@ -1900,13 +1900,13 @@ if [ "$rtd" = 'y' ] && [ "$shrd" = 'y' ] && [ "$dist" != 'y' ] then echo ' ' >> matrix.body - echo "$rtst $ww3 -w work_SHRD_RTD -o both ww3_tp2.11" >> matrix.body + echo "$rtst $ww3 -w work_SHRD_RTD ww3_tp2.11" >> matrix.body fi if [ "$rtd" = 'y' ] && [ "$dist" = 'y' ] then echo ' ' >> matrix.body - echo "$rtst -s MPI -w work_MPI -f -p $mpi -n $np $ww3 -o both ww3_tp2.11" >> matrix.body + echo "$rtst -s MPI -w work_MPI -f -p $mpi -n $np $ww3 ww3_tp2.11" >> matrix.body fi # mud/ice cases @@ -1926,7 +1926,7 @@ echo "$rtst -g 10km -w work_10km_IC1 -i input_IC1 $ww3 ww3_tic1.1" >> matrix.body echo "$rtst -g 20km -w work_20km_IC1 -i input_IC1 $ww3 ww3_tic1.1" >> matrix.body echo "$rtst -w work_IC1 -i input_IC1 $ww3 ww3_tic2.1" >> matrix.body - echo "$rtst -w work_IC2IS2 -o netcdf $ww3 ww3_tic2.2" >> matrix.body + echo "$rtst -w work_IC2IS2 $ww3 ww3_tic2.2" >> matrix.body echo "$rtst -g 1000m -w work_1000m_IC2_nrl -i input_IC2_nrl $ww3 ww3_tic1.1" >> matrix.body echo "$rtst -w work_IC2_nondisp_SMPL -i input_IC2_nondisp $ww3 ww3_tic1.1" >> matrix.body echo "$rtst -g 1000m_nondisp -w work_1000m_nondisp_IC2_ifr -i input_IC2_ifr $ww3 ww3_tic1.1" >> matrix.body @@ -1970,10 +1970,10 @@ echo "$rtst -s PR3_UQ_REFRX -w work_IC3_2.5k_PR3_UQ -i input_IC3_2.5k $ww3 ww3_tic1.3" >> matrix.body echo "$rtst -s PR3_UNO_REFRX -w work_IC3_0.5k_PR3_UNO -i input_IC3_0.5k $ww3 ww3_tic1.3" >> matrix.body echo "$rtst -s PR3_UNO_REFRX -w work_IC3_2.5k_PR3_UNO -i input_IC3_2.5k $ww3 ww3_tic1.3" >> matrix.body - echo "$rtst -s IC0IS2 -w work_IC0IS2_1000 -g 1000m -o netcdf $ww3 ww3_tic1.4" >> matrix.body - echo "$rtst -s IC1IS2 -w work_IC1IS2_1000 -g 1000m -o netcdf $ww3 ww3_tic1.4" >> matrix.body - echo "$rtst -s IC2IS2 -w work_IC2IS2_IC2b -g IC2b_1000m -o netcdf $ww3 ww3_tic1.4" >> matrix.body - echo "$rtst -s IC2IS2 -w work_IC2IS2_IC2d -g IC2d_1000m -o netcdf $ww3 ww3_tic1.4" >> matrix.body + echo "$rtst -s IC0IS2 -w work_IC0IS2_1000 -g 1000m $ww3 ww3_tic1.4" >> matrix.body + 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_IC2IS2creep -g creepOnly $ww3 ww3_tic2.3" >> matrix.body echo "$rtst -s IC2IS2 -w work_IC2IS2dissip -g dissipOnly $ww3 ww3_tic2.3" >> matrix.body @@ -2002,22 +2002,22 @@ if [ "$pdlib" = 'y' ] && [ "$dist" = 'y' ] then echo ' ' >> matrix.body - echo "$rtst -s MPI -s NO_PDLIB -w work_a -g a -f -p $mpi -n $np -o all $ww3 ww3_tp2.17" >> matrix.body - echo "$rtst -s MPI -s NO_PDLIB -w work_ma -m grdset_a -f -p $mpi -n $np -o all $ww3 ww3_tp2.17" >> matrix.body - echo "$rtst -s MPI -s PDLIB -w work_b -g b -f -p $mpi -n $np -o all $ww3 ww3_tp2.17" >> matrix.body - echo "$rtst -s MPI -s PDLIB -w work_c -g c -f -p $mpi -n $np -o all $ww3 ww3_tp2.17" >> matrix.body - echo "$rtst -s MPI -s PDLIB -w work_pdlib -g pdlib -f -p $mpi -n $np -o all $ww3 ww3_tp2.6" >> matrix.body - echo "$rtst -s MPI -s PDLIB -w work_mb -m grdset_b -f -p $mpi -n $np -o all $ww3 ww3_tp2.17" >> matrix.body - echo "$rtst -s MPI -s PDLIB -w work_mc -m grdset_c -f -p $mpi -n $np -o all $ww3 ww3_tp2.17" >> matrix.body + echo "$rtst -s MPI -s NO_PDLIB -w work_a -g a -f -p $mpi -n $np $ww3 ww3_tp2.17" >> matrix.body + 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_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' ] then echo "mkdir -p ww3_tp2.17/work_ma1" >> matrix.body echo "cp ww3_tp2.17/work_ma/restart001.inla ww3_tp2.17/work_ma1/restart.inla" >> matrix.body - echo "$rtst -s MPI -s NO_PDLIB -w work_ma1 -m grdset_a1 -f -p $mpi -n $np -o all $ww3 ww3_tp2.17" >> matrix.body + echo "$rtst -s MPI -s NO_PDLIB -w work_ma1 -m grdset_a1 -f -p $mpi -n $np $ww3 ww3_tp2.17" >> matrix.body echo "./bin/test.comp ww3_tp2.17 work_ma work_ma1" >> matrix.body echo "mkdir -p ww3_tp2.17/work_mc1" >> matrix.body echo "cp ww3_tp2.17/work_mc/restart001.inlc ww3_tp2.17/work_mc1/restart.inlc" >> matrix.body - echo "$rtst -s MPI -s PDLIB -w work_mc1 -m grdset_c1 -f -p $mpi -n $np -o all $ww3 ww3_tp2.17" >> matrix.body + echo "$rtst -s MPI -s PDLIB -w work_mc1 -m grdset_c1 -f -p $mpi -n $np $ww3 ww3_tp2.17" >> matrix.body echo "./bin/test.comp ww3_tp2.17 work_mc work_mc1" >> matrix.body fi fi @@ -2042,12 +2042,12 @@ if [ "$uost" = 'y' ] && [ "$dist" = 'y' ] then echo ' ' >> matrix.body - echo "$rtst -s MPI -s NO_PDLIB -w work_a -g a -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.21" >> matrix.body - echo "$rtst -s MPI -s NO_PDLIB -w work_ma -m grdset_a -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.21" >> matrix.body + echo "$rtst -s MPI -s NO_PDLIB -w work_a -g a -f -p $mpi -n $np $ww3 ww3_tp2.21" >> matrix.body + echo "$rtst -s MPI -s NO_PDLIB -w work_ma -m grdset_a -f -p $mpi -n $np $ww3 ww3_tp2.21" >> matrix.body if [ "$pdlib" = 'y' ] then - echo "$rtst -s MPI -s PDLIB -w work_b -g b -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.21" >> matrix.body - echo "$rtst -s MPI -s PDLIB -w work_mb -m grdset_b -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.21" >> matrix.body + echo "$rtst -s MPI -s PDLIB -w work_b -g b -f -p $mpi -n $np $ww3 ww3_tp2.21" >> matrix.body + echo "$rtst -s MPI -s PDLIB -w work_mb -m grdset_b -f -p $mpi -n $np $ww3 ww3_tp2.21" >> matrix.body fi fi @@ -2075,28 +2075,28 @@ if [ "$oasis" = 'y' ] && [ "$dist" = 'y' ] then echo ' ' >> matrix.body - echo "$rtst -s OASACM -w work_OASACM -C OASIS -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.14" >> matrix.body - echo "$rtst -s OASACM2 -w work_OASACM2 -C OASIS -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.14" >> matrix.body + echo "$rtst -s OASACM -w work_OASACM -C OASIS -f -p $mpi -n $np $ww3 ww3_tp2.14" >> matrix.body + echo "$rtst -s OASACM2 -w work_OASACM2 -C OASIS -f -p $mpi -n $np $ww3 ww3_tp2.14" >> matrix.body echo "mkdir -p ww3_tp2.14/work_OASACM3" >> matrix.body echo "cp ww3_tp2.14/input/ww3_shel_OASACM3.nml ww3_tp2.14/work_OASACM3/ww3_shel.nml" >> matrix.body halfnp=$(($np / 2)) - echo "$rtst -s OASACM3 -w work_OASACM3 -f -p $mpi -n $halfnp -o netcdf $ww3 ww3_tp2.14" >> matrix.body + echo "$rtst -s OASACM3 -w work_OASACM3 -f -p $mpi -n $halfnp $ww3 ww3_tp2.14" >> matrix.body echo "mkdir -p ww3_tp2.14/work_OASACM4" >> matrix.body echo "ln -sf ../work_OASACM3/restart001.ww3 ww3_tp2.14/work_OASACM4/restart.ww3" >> matrix.body - echo "$rtst -r ww3_grid -s OASACM4 -w work_OASACM4 -C OASIS -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.14" >> matrix.body - echo "$rtst -r ww3_shel -s OASACM4 -w work_OASACM4 -C OASIS -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.14" >> matrix.body - echo "$rtst -r ww3_ounf -s OASACM4 -w work_OASACM4 -C OASIS -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.14" >> matrix.body + echo "$rtst -r ww3_grid -s OASACM4 -w work_OASACM4 -C OASIS -f -p $mpi -n $np $ww3 ww3_tp2.14" >> matrix.body + echo "$rtst -r ww3_shel -s OASACM4 -w work_OASACM4 -C OASIS -f -p $mpi -n $np $ww3 ww3_tp2.14" >> matrix.body + echo "$rtst -r ww3_ounf -s OASACM4 -w work_OASACM4 -C OASIS -f -p $mpi -n $np $ww3 ww3_tp2.14" >> matrix.body echo "mkdir -p ww3_tp2.14/work_OASACM5" >> matrix.body echo "ln -sf ../work_OASACM4/restart001.ww3 ww3_tp2.14/work_OASACM5/restart.ww3" >> matrix.body - echo "$rtst -r ww3_grid -s OASACM5 -w work_OASACM5 -C OASIS -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.14" >> matrix.body - echo "$rtst -r ww3_shel -s OASACM5 -w work_OASACM5 -C OASIS -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.14" >> matrix.body - echo "$rtst -r ww3_ounf -s OASACM5 -w work_OASACM5 -C OASIS -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.14" >> matrix.body + echo "$rtst -r ww3_grid -s OASACM5 -w work_OASACM5 -C OASIS -f -p $mpi -n $np $ww3 ww3_tp2.14" >> matrix.body + echo "$rtst -r ww3_shel -s OASACM5 -w work_OASACM5 -C OASIS -f -p $mpi -n $np $ww3 ww3_tp2.14" >> matrix.body + echo "$rtst -r ww3_ounf -s OASACM5 -w work_OASACM5 -C OASIS -f -p $mpi -n $np $ww3 ww3_tp2.14" >> matrix.body echo "mv ww3_tp2.14/input/ww3_ounf.inp ww3_tp2.14/input/ww3_ounf.inp.bak" >> matrix.body echo "cp ww3_tp2.14/input/ww3_ounf.inp-OASACM6 ww3_tp2.14/input/ww3_ounf.inp" >> matrix.body - echo "$rtst -g OASACM6 -s OASACM6 -w work_OASACM6 -C OASIS -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.14" >> matrix.body + echo "$rtst -g OASACM6 -s OASACM6 -w work_OASACM6 -C OASIS -f -p $mpi -n $np $ww3 ww3_tp2.14" >> matrix.body echo "mv ww3_tp2.14/input/ww3_ounf.inp.bak ww3_tp2.14/input/ww3_ounf.inp" >> matrix.body - echo "$rtst -s OASOCM -w work_OASOCM -C OASIS -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.14" >> matrix.body - echo "$rtst -s OASICM -w work_OASICM -C OASIS -f -p $mpi -n $np -o netcdf $ww3 ww3_tp2.14" >> matrix.body + echo "$rtst -s OASOCM -w work_OASOCM -C OASIS -f -p $mpi -n $np $ww3 ww3_tp2.14" >> matrix.body + echo "$rtst -s OASICM -w work_OASICM -C OASIS -f -p $mpi -n $np $ww3 ww3_tp2.14" >> matrix.body fi #Test of UFS applications with ww3_multi and grib2 output @@ -2106,43 +2106,43 @@ if [ "$ufscoarse" = 'y' ] then echo ' ' >> matrix.body - echo "$rtst -s MPI -w work_c -m grdset_c -f -p $mpi -n $np -o all $ww3 ww3_ufs1.1" >> matrix.body + echo "$rtst -s MPI -w work_c -m grdset_c -f -p $mpi -n $np $ww3 ww3_ufs1.1" >> matrix.body if [ "$npl_b4b" = 'y' ] then halfnp=$(($np / 2)) - echo "$rtst -s MPI -w work_c_npl -m grdset_c -f -p $mpi -n $halfnp -o all $ww3 ww3_ufs1.1" >> matrix.body + echo "$rtst -s MPI -w work_c_npl -m grdset_c -f -p $mpi -n $halfnp $ww3 ww3_ufs1.1" >> matrix.body echo "./bin/test.comp ww3_ufs1.1 work_c work_c_npl" >> matrix.body fi if [ "$nth_b4b" = 'y' ] then - echo "$rtst -s MPI_OMPH -w work_c_nth -m grdset_c -f -p $mpi -n $nr -t $nth -o all $ww3 ww3_ufs1.1" >> matrix.body + echo "$rtst -s MPI_OMPH -w work_c_nth -m grdset_c -f -p $mpi -n $nr -t $nth $ww3 ww3_ufs1.1" >> matrix.body echo "./bin/test.comp ww3_ufs1.1 work_c work_c_nth" >> matrix.body fi if [ "$rstrt_b4b" = 'y' ] then echo "mkdir -p ww3_ufs1.1/work_d" >> matrix.body echo "cp ww3_ufs1.1/work_c/20210401.030000.restart.glo_5deg ww3_ufs1.1/work_d/restart.glo_5deg" >> matrix.body - echo "$rtst -s MPI -w work_d -m grdset_d -f -p $mpi -n $np -o all $ww3 ww3_ufs1.1" >> matrix.body + echo "$rtst -s MPI -w work_d -m grdset_d -f -p $mpi -n $np $ww3 ww3_ufs1.1" >> matrix.body echo "./bin/test.comp ww3_ufs1.1 work_c work_d" >> matrix.body fi else echo ' ' >> matrix.body - echo "$rtst -s MPI_OMPH -w work_a -m grdset_a -f -p $mpi -n $npl -t $nth1 -o all $ww3 ww3_ufs1.1" >> matrix.body + echo "$rtst -s MPI_OMPH -w work_a -m grdset_a -f -p $mpi -n $npl -t $nth1 $ww3 ww3_ufs1.1" >> matrix.body if [ "$npl_b4b" = 'y' ] then - echo "$rtst -s MPI_OMPH -w work_a_npl -m grdset_a -f -p $mpi -n $npl1 -t $nth1 -o all $ww3 ww3_ufs1.1" >> matrix.body + echo "$rtst -s MPI_OMPH -w work_a_npl -m grdset_a -f -p $mpi -n $npl1 -t $nth1 $ww3 ww3_ufs1.1" >> matrix.body echo "./bin/test.comp ww3_ufs1.1 work_a work_a_npl" >> matrix.body fi if [ "$nth_b4b" = 'y' ] then - echo "$rtst -s MPI_OMPH -w work_a_nth -m grdset_a -f -p $mpi -n $npl -t $nth -o all $ww3 ww3_ufs1.1" >> matrix.body + echo "$rtst -s MPI_OMPH -w work_a_nth -m grdset_a -f -p $mpi -n $npl -t $nth $ww3 ww3_ufs1.1" >> matrix.body echo "./bin/test.comp ww3_ufs1.1 work_a work_a_nth" >> matrix.body fi if [ "$rstrt_b4b" = 'y' ] then echo "mkdir -p ww3_ufs1.1/work_b" >> matrix.body echo "cp ww3_ufs1.1/work_a/20210401.030000.restart.glo_1deg ww3_ufs1.1/work_b/restart.glo_1deg" >> matrix.body - echo "$rtst -s MPI_OMPH -w work_b -m grdset_b -f -p $mpi -n $npl -t $nth1 -o all $ww3 ww3_ufs1.1" >> matrix.body + echo "$rtst -s MPI_OMPH -w work_b -m grdset_b -f -p $mpi -n $npl -t $nth1 $ww3 ww3_ufs1.1" >> matrix.body echo "./bin/test.comp ww3_ufs1.1 work_a work_b" >> matrix.body fi fi @@ -2152,12 +2152,12 @@ if [ "$ufs" = 'y' ] && [ "$esmf" = 'y' ] && [ "$grib" = 'y' ] then echo ' ' >> matrix.body - echo "$rtst -s MPI -w work_a_esmf -m grdset_a -C ESMF -f -p $mpi -n $npl -o all $ww3 ww3_ufs1.1" >> matrix.body + echo "$rtst -s MPI -w work_a_esmf -m grdset_a -C ESMF -f -p $mpi -n $npl $ww3 ww3_ufs1.1" >> matrix.body if [ "$rstrt_b4b" = 'y' ] then echo "mkdir -p ww3_ufs1.1/work_b_esmf" >> matrix.body echo "cp ww3_ufs1.1/work_a_esmf/20210401.030000.restart.glo_1deg ww3_ufs1.1/work_b_esmf/restart.glo_1deg" >> matrix.body - echo "$rtst -s MPI -w work_b_esmf -m grdset_b -C ESMF -f -p $mpi -n $npl -o all $ww3 ww3_ufs1.1" >> matrix.body + echo "$rtst -s MPI -w work_b_esmf -m grdset_b -C ESMF -f -p $mpi -n $npl $ww3 ww3_ufs1.1" >> matrix.body echo "./bin/test.comp ww3_ufs1.1 work_a_esmf work_b_esmf" >> matrix.body fi fi @@ -2166,14 +2166,14 @@ if [ "$ufs" = 'y' ] && [ "$grib" = 'y' ] then echo ' ' >> matrix.body - echo "$rtst -s MPI_OMPH -w work_a -m grdset_a -f -p $mpi -n $npl -t $nth1 -o all $ww3 ww3_ufs1.2" >> matrix.body + echo "$rtst -s MPI_OMPH -w work_a -m grdset_a -f -p $mpi -n $npl -t $nth1 $ww3 ww3_ufs1.2" >> matrix.body if [ "$rstrt_b4b" = 'y' ] then echo "mkdir -p ww3_ufs1.2/work_b" >> matrix.body echo "cp ww3_ufs1.2/work_a/20210401.030000.restart.gnh_10m ww3_ufs1.2/work_b/restart.gnh_10m" >> matrix.body echo "cp ww3_ufs1.2/work_a/20210401.030000.restart.gsh_15m ww3_ufs1.2/work_b/restart.gsh_15m" >> matrix.body echo "cp ww3_ufs1.2/work_a/20210401.030000.restart.aoc_9km ww3_ufs1.2/work_b/restart.aoc_9km" >> matrix.body - echo "$rtst -s MPI_OMPH -w work_b -m grdset_b -f -p $mpi -n $npl -t $nth1 -o all $ww3 ww3_ufs1.2" >> matrix.body + echo "$rtst -s MPI_OMPH -w work_b -m grdset_b -f -p $mpi -n $npl -t $nth1 $ww3 ww3_ufs1.2" >> matrix.body echo "./bin/test.comp ww3_ufs1.2 work_a work_b" >> matrix.body fi fi @@ -2182,14 +2182,14 @@ if [ "$ufs" = 'y' ] && [ "$esmf" = 'y' ] && [ "$grib" = 'y' ] then echo ' ' >> matrix.body - echo "$rtst -s MPI_OMPH -w work_a_esmf -m grdset_a -C ESMF -f -p $mpi -n $npl -t $nth1 -o all $ww3 ww3_ufs1.2" >> matrix.body + echo "$rtst -s MPI_OMPH -w work_a_esmf -m grdset_a -C ESMF -f -p $mpi -n $npl -t $nth1 $ww3 ww3_ufs1.2" >> matrix.body if [ "$rstrt_b4b" = 'y' ] then echo "mkdir -p ww3_ufs1.2/work_b_esmf" >> matrix.body echo "cp ww3_ufs1.2/work_a_esmf/20210401.030000.restart.gnh_10m ww3_ufs1.2/work_b_esmf/restart.gnh_10m" >> matrix.body echo "cp ww3_ufs1.2/work_a_esmf/20210401.030000.restart.gsh_15m ww3_ufs1.2/work_b_esmf/restart.gsh_15m" >> matrix.body echo "cp ww3_ufs1.2/work_a_esmf/20210401.030000.restart.aoc_9km ww3_ufs1.2/work_b_esmf/restart.aoc_9km" >> matrix.body - echo "$rtst -s MPI_OMPH -w work_b_esmf -m grdset_b -C ESMF -f -p $mpi -n $npl -t $nth1 -o all $ww3 ww3_ufs1.2" >> matrix.body + echo "$rtst -s MPI_OMPH -w work_b_esmf -m grdset_b -C ESMF -f -p $mpi -n $npl -t $nth1 $ww3 ww3_ufs1.2" >> matrix.body echo "./bin/test.comp ww3_ufs1.2 work_a_esmf work_b_esmf" >> matrix.body fi fi @@ -2199,7 +2199,7 @@ if [ "$ufs" = 'y' ] && [ "$grib" = 'y' ] then echo ' ' >> matrix.body - echo "$rtst -s MPI_OMPH -w work_a -m grdset_a -f -p $mpi -n $npl -t $nth1 -o all $ww3 ww3_ufs1.3" >> matrix.body + echo "$rtst -s MPI_OMPH -w work_a -m grdset_a -f -p $mpi -n $npl -t $nth1 $ww3 ww3_ufs1.3" >> matrix.body fi @@ -2207,16 +2207,16 @@ if [ "$calendar" = 'y' ] then echo ' ' >> matrix.body - echo "$rtst -g STD -w work_STD -o netcdf $ww3 ww3_tc1" >> matrix.body - echo "$rtst -g C360 -w work_C360 -o netcdf $ww3 ww3_tc1" >> matrix.body - echo "$rtst -g C365 -w work_C365 -o netcdf $ww3 ww3_tc1" >> matrix.body + echo "$rtst -g STD -w work_STD $ww3 ww3_tc1" >> matrix.body + echo "$rtst -g C360 -w work_C360 $ww3 ww3_tc1" >> matrix.body + echo "$rtst -g C365 -w work_C365 $ww3 ww3_tc1" >> matrix.body fi # Configurable netCDF metadata in ww3_ounf if [ "$confignc" = 'y' ] && [ "$shrd" = 'y' ] then echo ' ' >> matrix.body - echo "$rtst -o netcdf -N $ww3 ww3_tnc1" >> matrix.body + echo "$rtst -N $ww3 ww3_tnc1" >> matrix.body fi # --------------------------------------------------------------------------- # diff --git a/regtests/bin/matrix_datarmor b/regtests/bin/matrix_datarmor index 9f449bdcf..915cd5876 100755 --- a/regtests/bin/matrix_datarmor +++ b/regtests/bin/matrix_datarmor @@ -1,6 +1,6 @@ #!/bin/bash # --------------------------------------------------------------------------- # -# matrix.go: Run matrix of regression tests on target machine. # +# matrix_datarmor: Run matrix of regression tests on target machine. # # # # Remarks: # # - This version is set up for automatic w3_setenv script and for the # @@ -8,9 +8,12 @@ # computer, please copy rather than modify. # # # # Hendrik L. Tolman # +# Mickael Accensi # +# # # August 2013 # # December 2013 # # April 2018 # +# October 2021 # # # # Copyright 2013 National Weather Service (NWS), # # National Oceanic and Atmospheric Administration. All rights # @@ -31,16 +34,30 @@ echo "Save source codes : $source" echo "Save listings : $list" +# Compiler option. Choose appropriate compiler and set cmplOption to +# y if using for the first time or using a different compiler + + cmplr=datarmor_intel + export cmplOption='y' # 1. Set up + + export cmplOption='y' + export np='28' #number of mpi tasks + export npl='28' #number of mpi tasks for ufs applications and large setups + export npl1='20' #number of mpi tasks for ufs/large setups (b4b check) + export nr='4' #number of mpi tasks for hybrid + export nth='7' #number of threads + export nth1='6' #number of threads (b4b check) + # 1.a Computer/ user dependent set up echo '#!/bin/bash' > matrix.head echo ' ' >> matrix.head echo '#PBS -q mpi_1' >> matrix.head - echo '#PBS -l mem=20G' >> matrix.head - echo '#PBS -l walltime=48:00:00' >> matrix.head - echo '#PBS -N ww3_regtest' >> matrix.head + echo "#PBS -l select=1:ncpus=28:mpiprocs=$nr:ompthreads=$nth:mem=20G" >> matrix.head + echo '#PBS -l walltime=08:00:00' >> matrix.head + echo "#PBS -N $(basename $(dirname $(dirname $PWD)))" >> matrix.head echo '#PBS -j oe' >> matrix.head echo '#PBS -o matrix.out' >> matrix.head echo ' ' >> matrix.head @@ -48,72 +65,57 @@ echo " cd $(dirname $main_dir)/regtests" >> matrix.head echo ' ' >> matrix.head -# Netcdf modules - - cmplr=datarmor_intel +# Netcdf, grib and Parmetis modules echo ' source /usr/share/Modules/3.2.10/init/bash' >> matrix.head echo ' module purge' >> matrix.head - echo " export WW3_PARCOMPN=4" >> matrix.head if [ $cmplr = "datarmor_intel_debug" ] || [ $cmplr = "datarmor_intel" ] then + COMP='INTEL' echo ' module load intel-comp/18' >> matrix.head echo ' module load impi/2018.1.163' >> matrix.head - echo ' export PATH=${PATH}:/home/datawork-wave/NETCDF2019/INTEL/bin' >> matrix.head - echo ' export CPATH=${CPATH}:/home/datawork-wave/NETCDF2019/INTEL/include' >> matrix.head - echo ' export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/home/datawork-wave/NETCDF2019/INTEL/lib' >> matrix.head - echo ' export NETCDF_CONFIG=/home/datawork-wave/NETCDF2019/INTEL/bin/nc-config' >> matrix.head - echo ' export METIS_PATH=/home/datawork-wave/PARMETIS2019/INTEL' >> matrix.head - elif [ $cmplr = "datarmor_mpt_debug" ] || [ $cmplr = "datarmor_mpt" ] then + COMP='MPT' echo ' module load intel-comp/18' >> matrix.head echo ' module load mpt/2.18' >> matrix.head - echo ' export PATH=${PATH}:/home/datawork-wave/NETCDF2019/MPT/bin' >> matrix.head - echo ' export CPATH=${CPATH}:/home/datawork-wave/NETCDF2019/MPT/include' >> matrix.head - echo ' export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/home/datawork-wave/NETCDF2019/MPT/lib' >> matrix.head - echo ' export NETCDF_CONFIG=/home/datawork-wave/NETCDF2019/MPT/bin/nc-config' >> matrix.head - echo ' export METIS_PATH=/home/datawork-wave/PARMETIS2019/MPT' >> matrix.head - elif [ $cmplr = "datarmor_gnu_debug" ] || [ $cmplr = "datarmor_gnu" ] then + COMP='GNU' echo ' module load impi/2018.1.163' >> matrix.head - echo ' export PATH=${PATH}:/home/datawork-wave/NETCDF2019/GNU/bin' >> matrix.head - echo ' export CPATH=${CPATH}:/home/datawork-wave/NETCDF2019/GNU/include' >> matrix.head - echo ' export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/home/datawork-wave/NETCDF2019/GNU/lib' >> matrix.head - echo ' export NETCDF_CONFIG=/home/datawork-wave/NETCDF2019/GNU/bin/nc-config' >> matrix.head - echo ' export METIS_PATH=/home/datawork-wave/PARMETIS2019/GNU' >> matrix.head - elif [ $cmplr = "datarmor_pgi_debug" ] || [ $cmplr = "datarmor_pgi" ] then + COMP='PGI' echo ' module load pgi/17.10' >> matrix.head - echo ' export PATH=${PATH}:/home/datawork-wave/NETCDF2019/PGI/bin' >> matrix.head - echo ' export CPATH=${CPATH}:/home/datawork-wave/NETCDF2019/PGI/include' >> matrix.head - echo ' export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/home/datawork-wave/NETCDF2019/PGI/lib' >> matrix.head - echo ' export NETCDF_CONFIG=/home/datawork-wave/NETCDF2019/PGI/bin/nc-config' >> matrix.head - echo ' export METIS_PATH=/home/datawork-wave/PARMETIS2019/PGI' >> matrix.head fi + echo " export PATH=\${PATH}:/home/datawork-wave/NETCDF2019/${COMP}/bin" >> matrix.head + echo " export CPATH=\${CPATH}:/home/datawork-wave/NETCDF2019/${COMP}/include" >> matrix.head + echo " export LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:/home/datawork-wave/NETCDF2019/${COMP}/lib" >> matrix.head + echo " export NETCDF_CONFIG=/home/datawork-wave/NETCDF2019/${COMP}/bin/nc-config" >> matrix.head + echo " export METIS_PATH=/home/datawork-wave/PARMETIS2019/${COMP}" >> matrix.head + echo " export WW3_PARCOMPN=4" >> matrix.head + echo " export G2_LIB4=/home/datawork-wave/GRIB2021/${COMP}/lib/libg2.a" >> matrix.head + echo " export BACIO_LIB4=/home/datawork-wave/GRIB2021/${COMP}/lib/libbacio.a" >> matrix.head + echo " export JASPER_LIB=/home/datawork-wave/NETCDF2019/${COMP}/lib/libjasper.so" >> matrix.head + echo " export PNG_LIB=/home/datawork-wave/NETCDF2019/${COMP}/lib/libpng.so" >> matrix.head + echo " export Z_LIB=/lib64/libz.so.1" >> matrix.head echo ' ' -# Compiler option. Choose appropriate compiler and set cmplOption to -# y if using for the first time or using a different compiler - - export cmplOption='y' - - export mpi='$MPI_LAUNCH' - export np='28' - export nr='14' - export nth='2' + export mpi='$MPI_LAUNCH' +# Compile option if [ "$cmplOption" = 'y' ] then - export rtst="./bin/run_test -o both -N -f -S -T -c $cmplr" + export opt="-o all -f -c $cmplr -S -T" else - export rtst="./bin/run_test -o both -N -f -S -T" + export opt="-o all -f -S -T" fi +# Base run_test command line + export rtst="./bin/run_test $opt" + export ww3='../model' # 1.b Flags to do course selection - - - - - - - - - - - - - - - - - - - - - - @@ -122,7 +124,7 @@ export shrd='y' # Do shared architecture tests export dist='y' # Do distributed architecture (MPI) tests export omp='y' # Threaded (OpenMP) tests - export hybd='n' # Hybrid options + export hybd='y' # Hybrid options export prop1D='y' # 1-D propagation tests (ww3_tp1.X) export prop2D='y' # 2-D propagation tests (ww3_tp2.X) @@ -138,7 +140,7 @@ export infgrv='y' # Second harmonic generation tests export uost='y' # ww3_ts4 Unresolved Obstacles Source Term (UOST) export assim='y' # Restart spectra update - export oasis='y' # Atmosphere, ocean, and ice coupling using oasis + export oasis='y' # Atmosphere, ocean, and ice coupling using OASIS export calendar='y' # Calendar type export confignc='y' # Configurable netCDF meta data (ww3_ounf) @@ -153,13 +155,13 @@ export multi09='y' # mww3_test_09 (SMC multi grid test) export ufs='n' # The Unified Forecast System export ufscoarse='n' # Option for small PCs - export grib='n' # grib file field output + export grib='y' # grib file field output export rstrt_b4b='y' # Restart Reproducibility export npl_b4b='y' # MPI task Reproducibility export nth_b4b='y' # Thread Reproducibility export esmf='n' # ESMF coupling # export filter='PR3 ST2 UQ' - # The filter does a set of consecutinve greps on the + # The filter does a set of consecutive greps on the # command lines generated by filter.base with the above # selected options. @@ -169,6 +171,7 @@ $main_dir/../regtests/bin/matrix.base + $main_dir/../regtests/bin/matrix_divider_p.sh # --------------------------------------------------------------------------- # # End to the matrix # # --------------------------------------------------------------------------- # diff --git a/regtests/bin/matrix_milhydro b/regtests/bin/matrix_milhydro index 6fdb27e35..1819084c4 100755 --- a/regtests/bin/matrix_milhydro +++ b/regtests/bin/matrix_milhydro @@ -65,9 +65,9 @@ # Compile option if [ "$cmplOption" = 'y' ] then - opt="-c $cmplr -S -T" + opt="-o all -c $cmplr -S -T" else - opt="-S" + opt="-o all -S" fi # Batch queue option if [ "$batchq" = 'slurm' ] diff --git a/regtests/bin/matrix_ncep b/regtests/bin/matrix_ncep index fb7e2d258..c2954cd4e 100755 --- a/regtests/bin/matrix_ncep +++ b/regtests/bin/matrix_ncep @@ -164,9 +164,9 @@ # Compile option if [ "$cmplOption" = 'y' ] then - opt="-c $cmplr -S -T" + opt="-o all -c $cmplr -S -T" else - opt="-S" + opt="-o all -S" fi # Batch queue option if [ "$batchq" = 'slurm' ] diff --git a/regtests/bin/matrix_s4 b/regtests/bin/matrix_s4 index 7413c7ffa..ae67c1b7b 100755 --- a/regtests/bin/matrix_s4 +++ b/regtests/bin/matrix_s4 @@ -121,9 +121,9 @@ # Compile option if [ "$cmplOption" = 'y' ] then - opt="-c $cmplr -S -T" + opt="-o all -c $cmplr -S -T" else - opt="-S" + opt="-o all -S" fi # Batch queue option opt="-b $batchq $opt" diff --git a/regtests/bin/matrix_ukmo_cray b/regtests/bin/matrix_ukmo_cray index 2cbbb72f2..e49890ef2 100755 --- a/regtests/bin/matrix_ukmo_cray +++ b/regtests/bin/matrix_ukmo_cray @@ -104,9 +104,9 @@ fi if [ "$cmplOption" = 'y' ] then - export rtst="./bin/run_test -c $cmplr -S" + export rtst="./bin/run_test -o both -c $cmplr -S" else - export rtst="./bin/run_test -S" + export rtst="./bin/run_test -o both -S" fi export ww3='../model' diff --git a/regtests/bin/run_test b/regtests/bin/run_test index 6b22e4120..b14739b46 100755 --- a/regtests/bin/run_test +++ b/regtests/bin/run_test @@ -469,8 +469,7 @@ fi # 3.b2 Preprocess cdl files into nc files ----------------------------------- # -filescdl=$path_i/*.cdl -for f in $filescdl +for f in $(find $path_i/ -type f -name "*.cdl") do echo "Converting $f to NetCDF" # take action on each file. Note that converted file is in $path_w diff --git a/regtests/ww3_tic2.2/input/ww3_outp_spec.inp b/regtests/ww3_tic2.2/input/ww3_outp_spec.inp index 91ccc1b90..095aa5006 100644 --- a/regtests/ww3_tic2.2/input/ww3_outp_spec.inp +++ b/regtests/ww3_tic2.2/input/ww3_outp_spec.inp @@ -2,17 +2,6 @@ $ WAVEWATCH III Point output post-processing $ ------------------------------------------ 19680606 120000 3600. 1 $ - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 -1 $ 1 diff --git a/regtests/ww3_tic2.2/input/ww3_outp_tab50.inp b/regtests/ww3_tic2.2/input/ww3_outp_tab50.inp index 59b43e4b8..64ff51ab8 100644 --- a/regtests/ww3_tic2.2/input/ww3_outp_tab50.inp +++ b/regtests/ww3_tic2.2/input/ww3_outp_tab50.inp @@ -2,30 +2,6 @@ $ WAVEWATCH III Point output post-processing $ ------------------------------------------ 19680606 000000 600. 9999 $ - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 18 - 19 - 20 - 21 - 22 - 23 - 24 -1 $ 2 diff --git a/regtests/ww3_tic2.2/input/ww3_outp_tab51.inp b/regtests/ww3_tic2.2/input/ww3_outp_tab51.inp index 386a1653d..8bdd659d6 100644 --- a/regtests/ww3_tic2.2/input/ww3_outp_tab51.inp +++ b/regtests/ww3_tic2.2/input/ww3_outp_tab51.inp @@ -2,8 +2,6 @@ $ WAVEWATCH III Point output post-processing $ ------------------------------------------ 19680606 000000 900. 49 $ -$ 1 - 16 -1 $ 2 diff --git a/regtests/ww3_tic2.2/input_IC2/ww3_outp_spec.inp b/regtests/ww3_tic2.2/input_IC2/ww3_outp_spec.inp index 91ccc1b90..095aa5006 100644 --- a/regtests/ww3_tic2.2/input_IC2/ww3_outp_spec.inp +++ b/regtests/ww3_tic2.2/input_IC2/ww3_outp_spec.inp @@ -2,17 +2,6 @@ $ WAVEWATCH III Point output post-processing $ ------------------------------------------ 19680606 120000 3600. 1 $ - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 -1 $ 1 diff --git a/regtests/ww3_tic2.2/input_IC2/ww3_outp_tab50.inp b/regtests/ww3_tic2.2/input_IC2/ww3_outp_tab50.inp index 59b43e4b8..64ff51ab8 100644 --- a/regtests/ww3_tic2.2/input_IC2/ww3_outp_tab50.inp +++ b/regtests/ww3_tic2.2/input_IC2/ww3_outp_tab50.inp @@ -2,30 +2,6 @@ $ WAVEWATCH III Point output post-processing $ ------------------------------------------ 19680606 000000 600. 9999 $ - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 18 - 19 - 20 - 21 - 22 - 23 - 24 -1 $ 2 diff --git a/regtests/ww3_tic2.2/input_IC2/ww3_outp_tab51.inp b/regtests/ww3_tic2.2/input_IC2/ww3_outp_tab51.inp index 386a1653d..8bdd659d6 100644 --- a/regtests/ww3_tic2.2/input_IC2/ww3_outp_tab51.inp +++ b/regtests/ww3_tic2.2/input_IC2/ww3_outp_tab51.inp @@ -2,8 +2,6 @@ $ WAVEWATCH III Point output post-processing $ ------------------------------------------ 19680606 000000 900. 49 $ -$ 1 - 16 -1 $ 2