diff --git a/src/test/check_test_value.f90 b/src/test/check_test_value.f90 index 2ee9bde..8828f82 100755 --- a/src/test/check_test_value.f90 +++ b/src/test/check_test_value.f90 @@ -9,12 +9,12 @@ subroutine check_test_value(branch) ! Local variables character(len=30) :: description - double precision :: value + double precision :: val double precision :: reference character(len=15) :: answer logical :: failed - double precision,parameter :: cutoff = 1d-10 + double precision,parameter :: thresh = 1d-10 ! Output variables @@ -45,19 +45,19 @@ subroutine check_test_value(branch) do read(11,'(A30)',end=11) description - read(11,'(F20.15)',end=11) value + read(11,'(F20.15)',end=11) val read(12,*,end=12) read(12,'(F20.15)',end=12) reference - if(abs(value-reference) < cutoff) then + if(dabs(val-reference)/(1d-15+dabs(reference)) < thresh) then answer = '.......... :-)' else answer = '.......... :-( ' failed = .true. end if write(*,'(1X,A1,1X,A30,1X,A1,1X,3F15.10,1X,A1,1X,A15,1X,A1)') & - '|',description,'|',value,reference,abs(value-reference),'|',answer,'|' + '|',description,'|',val,reference,abs(val-reference),'|',answer,'|' end do diff --git a/src/test/dump_test_value.f90 b/src/test/dump_test_value.f90 index ea00afe..e903e28 100755 --- a/src/test/dump_test_value.f90 +++ b/src/test/dump_test_value.f90 @@ -1,4 +1,4 @@ -subroutine dump_test_value(branch,description,value) +subroutine dump_test_value(branch, description, val) implicit none @@ -7,7 +7,7 @@ subroutine dump_test_value(branch,description,value) character(len=1),intent(in) :: branch character(len=*),intent(in) :: description - double precision,intent(in) :: value + double precision,intent(in) :: val ! Local variables @@ -15,18 +15,19 @@ subroutine dump_test_value(branch,description,value) if(branch == 'R') then - write(11,*) trim(description) - write(11,'(F20.15)') value + !write(1231597, '(A, ": ", F20.15)') '"' // trim(description) // '"', val + write(1231597, *) trim(description) + write(1231597, '(F20.15)') val elseif(branch == 'U') then - write(12,*) trim(description) - write(12,'(F20.15)') value + write(1232584,*) trim(description) + write(1232584,'(F20.15)') val elseif(branch == 'G') then - write(13,*) trim(description) - write(13,'(F20.15)') value + write(1234181,*) trim(description) + write(1234181,'(F20.15)') val else diff --git a/src/test/init_test.f90 b/src/test/init_test.f90 index 602ba54..b5ef295 100755 --- a/src/test/init_test.f90 +++ b/src/test/init_test.f90 @@ -12,10 +12,10 @@ subroutine init_test(doRtest,doUtest,doGtest) ! Output variables - if(doRtest) open(unit=11,file='test/Rtest.dat') + if(doRtest) open(unit=1231597, file='test/Rtest.dat') - if(doUtest) open(unit=12,file='test/Utest.dat') + if(doUtest) open(unit=1232584, file='test/Utest.dat') - if(doGtest) open(unit=13,file='test/Gtest.dat') + if(doGtest) open(unit=1234181, file='test/Gtest.dat') end subroutine diff --git a/src/test/stop_test.f90 b/src/test/stop_test.f90 index d41e2b0..185cbc5 100755 --- a/src/test/stop_test.f90 +++ b/src/test/stop_test.f90 @@ -12,10 +12,10 @@ subroutine stop_test(doRtest,doUtest,doGtest) ! Output variables - if(doRtest) close(unit=11) + if(doRtest) close(unit=1231597) - if(doUtest) close(unit=12) + if(doUtest) close(unit=1231597) - if(doGtest) close(unit=13) + if(doGtest) close(unit=1234181) end subroutine