diff --git a/test_prebuild/test_unit_conv/unit_conv_scheme_1.F90 b/test_prebuild/test_unit_conv/unit_conv_scheme_1.F90 index baa34385..d9488789 100644 --- a/test_prebuild/test_unit_conv/unit_conv_scheme_1.F90 +++ b/test_prebuild/test_unit_conv/unit_conv_scheme_1.F90 @@ -29,7 +29,7 @@ subroutine unit_conv_scheme_1_run(data_array, data_array_opt, errmsg, errflg) errmsg = '' errflg = 0 ! Check values in data array - write(error_unit,'(a,e12.4))') 'In unit_conv_scheme_1_run: checking min/max values of data array to be approximately ', target_value + write(error_unit,'(a,e12.4)') 'In unit_conv_scheme_1_run: checking min/max values of data array to be approximately ', target_value if (minval(data_array)<0.99*target_value .or. maxval(data_array)>1.01*target_value) then write(errmsg,'(3(a,e12.4),a)') "Error in unit_conv_scheme_1_run, expected values of approximately ", & target_value, " but got [ ", minval(data_array), " : ", maxval(data_array), " ]" @@ -37,13 +37,13 @@ subroutine unit_conv_scheme_1_run(data_array, data_array_opt, errmsg, errflg) return end if ! Check for presence of optional data array, then check its values - write(error_unit,'(a))') 'In unit_conv_scheme_1_run: checking for presence of optional data array' + write(error_unit,'(a)') 'In unit_conv_scheme_1_run: checking for presence of optional data array' if (.not. present(data_array_opt)) then - write(error_unit,'(a))') 'Error in unit_conv_scheme_1_run, optional data array expected but not present' + write(error_unit,'(a)') 'Error in unit_conv_scheme_1_run, optional data array expected but not present' errflg = 1 return endif - write(error_unit,'(a,e12.4))') 'In unit_conv_scheme_1_run: checking min/max values of optional data array to be approximately ', target_value + write(error_unit,'(a,e12.4)') 'In unit_conv_scheme_1_run: checking min/max values of optional data array to be approximately ', target_value if (minval(data_array_opt)<0.99*target_value .or. maxval(data_array_opt)>1.01*target_value) then write(errmsg,'(3(a,e12.4),a)') 'Error in unit_conv_scheme_1_run, expected values of approximately ', & target_value, ' but got [ ', minval(data_array_opt), ' : ', maxval(data_array_opt), ' ]' diff --git a/test_prebuild/test_unit_conv/unit_conv_scheme_2.F90 b/test_prebuild/test_unit_conv/unit_conv_scheme_2.F90 index 425e49d8..6b64402c 100644 --- a/test_prebuild/test_unit_conv/unit_conv_scheme_2.F90 +++ b/test_prebuild/test_unit_conv/unit_conv_scheme_2.F90 @@ -29,7 +29,7 @@ subroutine unit_conv_scheme_2_run(data_array, data_array_opt, errmsg, errflg) errmsg = '' errflg = 0 ! Check values in data array - write(error_unit,'(a,e12.4))') 'In unit_conv_scheme_2_run: checking min/max values of data array to be approximately ', target_value + write(error_unit,'(a,e12.4)') 'In unit_conv_scheme_2_run: checking min/max values of data array to be approximately ', target_value if (minval(data_array)<0.99*target_value .or. maxval(data_array)>1.01*target_value) then write(errmsg,'(3(a,e12.4),a)') 'Error in unit_conv_scheme_2_run, expected values of approximately ', & target_value, ' but got [ ', minval(data_array), ' : ', maxval(data_array), ' ]' @@ -37,13 +37,13 @@ subroutine unit_conv_scheme_2_run(data_array, data_array_opt, errmsg, errflg) return end if ! Check for presence of optional data array, then check its values - write(error_unit,'(a))') 'In unit_conv_scheme_2_run: checking for presence of optional data array' + write(error_unit,'(a)') 'In unit_conv_scheme_2_run: checking for presence of optional data array' if (.not. present(data_array_opt)) then - write(error_unit,'(a))') 'Error in unit_conv_scheme_2_run, optional data array expected but not present' + write(error_unit,'(a)') 'Error in unit_conv_scheme_2_run, optional data array expected but not present' errflg = 1 return endif - write(error_unit,'(a,e12.4))') 'In unit_conv_scheme_2_run: checking min/max values of optional data array to be approximately ', target_value + write(error_unit,'(a,e12.4)') 'In unit_conv_scheme_2_run: checking min/max values of optional data array to be approximately ', target_value if (minval(data_array_opt)<0.99*target_value .or. maxval(data_array_opt)>1.01*target_value) then write(errmsg,'(3(a,e12.4),a)') 'Error in unit_conv_scheme_2_run, expected values of approximately ', & target_value, ' but got [ ', minval(data_array_opt), ' : ', maxval(data_array_opt), ' ]'