Skip to content

Commit 1cacc43

Browse files
minor bugfix for matrix grepping on keywords (#1049)
1 parent 02cb72f commit 1cacc43

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

regtests/bin/run_cmake_test

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,9 @@ then
491491
cp $path_build/install/bin/ww3_shel $path_e/
492492
cp $path_build/install/bin/ww3_multi $path_e/
493493
cp $path_build/install/bin/ww3_systrk $path_e/
494-
cp $path_build/install/bin/ww3_prtide $path_e/
494+
if [ -e $path_build/install/bin/ww3_prtide ]; then
495+
cp $path_build/install/bin/ww3_prtide $path_e/
496+
fi
495497
fi
496498
else
497499
path_build=${path_build_root}
@@ -1127,9 +1129,9 @@ then
11271129

11281130
if [ $nml_input ] && [ ! -z "`ls ${path_i}/${prog}*.nml 2>/dev/null`" ]
11291131
then
1130-
inputs_tmp=`( ls ${path_i}/${prog}${gu}*nml)`
1132+
inputs_tmp="`ls ${path_i}/${prog}${gu}*nml 2>/dev/null`"
11311133
else
1132-
inputs_tmp=`( ls ${path_i}/${prog}${gu}*inp)`
1134+
inputs_tmp="`ls ${path_i}/${prog}${gu}*inp 2>/dev/null`"
11331135
fi
11341136

11351137
if [ ! -z "$inputs_tmp" ];then

regtests/ww3_tp2.12/info

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
# * ww3_grid.inp (dummy grid input file, with assoc .bot, .mask, .obst) #
3030
# * partition.ww3 (raw fields of partition data, 4 time steps) #
3131
# * ww3_systrk.inp (instruction file) #
32-
# * ww3_systrk will ABORT if endianess is incompatible with binary file! #
32+
# * ww3_systrk will stop if endianess is incompatible with binary file! #
3333
# #
3434
# Sample run_test commands : #
3535
# (Note: mpirun commands differ by local system) #

0 commit comments

Comments
 (0)