diff --git a/src/testprogs/rain_ice_old/main_rain_ice_old.F90 b/src/testprogs/rain_ice_old/main_rain_ice_old.F90 index 1c771702fcd7085186787b5ed85554432e829120..983d08f837136c34f4431dffb7d7c7332aa2791b 100644 --- a/src/testprogs/rain_ice_old/main_rain_ice_old.F90 +++ b/src/testprogs/rain_ice_old/main_rain_ice_old.F90 @@ -508,7 +508,7 @@ subroutine print_diff_1(array, ref) absval = max(abs(array(i)), abs(ref(i))) if (absval .gt. 0.) then if (abs(array(i) - ref(i))/absval .gt. threshold) then - write(output_unit, '(2i4, 4e16.6)') i, array(i), ref(i), abs(array(i) - ref(i)), abs(array(i) - ref(i))/absval + write(output_unit, '(1i4, 4e16.6)') i, array(i), ref(i), abs(array(i) - ref(i)), abs(array(i) - ref(i))/absval endif endif enddo diff --git a/tools/check_commit_testprogs.sh b/tools/check_commit_testprogs.sh index e2b4589d1f4de177a09cf4e0e5938258ca534931..485f1162c8c4bbfa6fc0f3f5ef22b39f2c78dbb9 100755 --- a/tools/check_commit_testprogs.sh +++ b/tools/check_commit_testprogs.sh @@ -263,8 +263,8 @@ if [ $check -eq 1 ]; then fi if [ $te -eq 0 ]; then set +e - mess=$(cmp <(cat $file1 | sed 's/\.\.//g' | sed 's/~=//g' | sed 's/!=//g') \ - <(cat $file2 | sed 's/\.\.//g' | sed 's/~=//g' | sed 's/!=//g') 246 246 2>&1) + mess=$(cmp <(cat $file1 | sed 's/\.\.//g' | sed 's/~=//g' | sed 's/!=//g' | grep -v 'Total time: ') \ + <(cat $file2 | sed 's/\.\.//g' | sed 's/~=//g' | sed 's/!=//g' | grep -v 'Total time: ') 246 246 2>&1) te=$? set -e #The use of "<()" bash syntax replaces the actual file name seen by cmp