removed old *.output* and *.spectralOut as they are not updated anyway from reference.

introduced a numbering scheme for variants
calculated new reference results due to slight changes
This commit is contained in:
Martin Diehl 2012-03-09 16:30:42 +00:00
parent ac5dd14c5f
commit efd653fb00
2 changed files with 31 additions and 14 deletions

View File

@ -20,34 +20,51 @@
!* $Id$
!##############################################################
MODULE prec
module prec
implicit none
! *** Precision of real and integer variables for python interfacing***
integer, parameter :: pReal = 8
integer, parameter :: pInt = 4
real(pReal), parameter :: DAMASK_NaN = real(Z'7FF0000000000001',pReal)
real(pReal), parameter :: tol_math_check = 1.0e-8_pReal
END MODULE prec
MODULE debug
end module prec
module debug
use prec, only: pInt
implicit none
integer(pInt), parameter :: debug_verbosity = 1_pInt
END MODULE debug
MODULE numerics
implicit none
integer(pInt), parameter, public :: &
debug_levelBasic = 2_pInt**1_pInt, &
debug_math = 2_pInt
integer(pInt), dimension(11+2), public :: &
debug_what = debug_levelBasic
end module debug
module numerics
use prec, only: pInt, pReal
implicit none
real(pReal), parameter :: fftw_timelimit = -1.0_pReal
integer(pInt), parameter :: fftw_planner_flag = 32_pInt
integer(pInt), parameter :: fixedSeed = 1_pInt
END MODULE numerics
MODULE IO
CONTAINS
end module numerics
module IO
contains
subroutine IO_error(error_ID,e,i,g,ext_msg)
use prec, only: pInt
implicit none
integer(pInt), intent(in) :: error_ID
integer(pInt), optional, intent(in) :: e,i,g
@ -60,4 +77,4 @@ MODULE IO
end select
end subroutine IO_error
END MODULE IO
end module IO

View File

@ -162,8 +162,8 @@ class Test():
table = damask.ASCIItable(refFile)
table.head_read()
refFile.close()
refArray = numpy.genfromtxt(refName,missing_values='n/a',skip_header = table.headerLen)
curArray = numpy.genfromtxt(curName,missing_values='n/a',skip_header = table.headerLen)
refArray = numpy.genfromtxt(refName,missing_values='n/a',skip_header = len(table.info)+1)
curArray = numpy.genfromtxt(curName,missing_values='n/a',skip_header = len(table.info)+1)
err = abs((refArray/curArray)-1.) # relative tolerance
refNaN=len(numpy.isnan(refArray))
curNaN=len(numpy.isnan(curArray))